Messages in this thread Patch in this message | | | From | Qian Cai <> | Subject | [PATCH] sched: fix a compilation warning in sched_init() | Date | Wed, 22 May 2019 14:20:06 -0400 |
| |
Compiling a kernel with both FAIR_GROUP_SCHED=n and RT_GROUP_SCHED=n will generate a warning using W=1,
kernel/sched/core.c: In function 'sched_init': kernel/sched/core.c:5906:32: warning: variable 'ptr' set but not used [-Wunused-but-set-variable] unsigned long alloc_size = 0, ptr; ^~~ Use this opportunity to tidy up a code a bit by removing unnecssary indentations and lines.
Signed-off-by: Qian Cai <cai@lca.pw> --- kernel/sched/core.c | 31 ++++++++++++------------------- 1 file changed, 12 insertions(+), 19 deletions(-)
diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 874c427742a9..e7aff6d173a3 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -5903,36 +5903,29 @@ int in_sched_functions(unsigned long addr) void __init sched_init(void) { int i, j; - unsigned long alloc_size = 0, ptr; +#if defined(CONFIG_FAIR_GROUP_SCHED) || defined(CONFIG_RT_GROUP_SCHED) + unsigned long alloc_size = 2 * nr_cpu_ids * sizeof(void **); + unsigned long ptr = (unsigned long)kzalloc(alloc_size, GFP_NOWAIT); - wait_bit_init(); - -#ifdef CONFIG_FAIR_GROUP_SCHED - alloc_size += 2 * nr_cpu_ids * sizeof(void **); #endif -#ifdef CONFIG_RT_GROUP_SCHED - alloc_size += 2 * nr_cpu_ids * sizeof(void **); -#endif - if (alloc_size) { - ptr = (unsigned long)kzalloc(alloc_size, GFP_NOWAIT); + wait_bit_init(); #ifdef CONFIG_FAIR_GROUP_SCHED - root_task_group.se = (struct sched_entity **)ptr; - ptr += nr_cpu_ids * sizeof(void **); + root_task_group.se = (struct sched_entity **)ptr; + ptr += nr_cpu_ids * sizeof(void **); - root_task_group.cfs_rq = (struct cfs_rq **)ptr; - ptr += nr_cpu_ids * sizeof(void **); + root_task_group.cfs_rq = (struct cfs_rq **)ptr; + ptr += nr_cpu_ids * sizeof(void **); #endif /* CONFIG_FAIR_GROUP_SCHED */ #ifdef CONFIG_RT_GROUP_SCHED - root_task_group.rt_se = (struct sched_rt_entity **)ptr; - ptr += nr_cpu_ids * sizeof(void **); + root_task_group.rt_se = (struct sched_rt_entity **)ptr; + ptr += nr_cpu_ids * sizeof(void **); - root_task_group.rt_rq = (struct rt_rq **)ptr; - ptr += nr_cpu_ids * sizeof(void **); + root_task_group.rt_rq = (struct rt_rq **)ptr; + ptr += nr_cpu_ids * sizeof(void **); #endif /* CONFIG_RT_GROUP_SCHED */ - } #ifdef CONFIG_CPUMASK_OFFSTACK for_each_possible_cpu(i) { per_cpu(load_balance_mask, i) = (cpumask_var_t)kzalloc_node( -- 1.8.3.1
| |