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

Commit 6d101ba6 authored by Olof Johansson's avatar Olof Johansson Committed by Linus Torvalds
Browse files

sched/fair: Fix warning on non-SMP build 



Caused by making the variable static:

  kernel/sched/fair.c:119:21: warning: 'capacity_margin' defined but not used [-Wunused-variable]

Seems easiest to just move it up under the existing ifdef CONFIG_SMP
that's a few lines above.

Fixes: ed8885a1 ('sched/fair: Make some variables static')
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent fc2fd5f0

kernel/sched/fair.c

+8 −8
Original line number Diff line number Diff line
@@ -94,6 +94,14 @@ int __weak arch_asym_cpu_priority(int cpu) 
{

	return -cpu;

}



/*

 * The margin used when comparing utilization with CPU capacity:

 * util * margin < capacity * 1024

 *

 * (default: ~20%)

 */

static unsigned int capacity_margin			= 1280;

#endif



#ifdef CONFIG_CFS_BANDWIDTH
@@ -110,14 +118,6 @@ int __weak arch_asym_cpu_priority(int cpu) 
unsigned int sysctl_sched_cfs_bandwidth_slice		= 5000UL;

#endif



/*

 * The margin used when comparing utilization with CPU capacity:

 * util * margin < capacity * 1024

 *

 * (default: ~20%)

 */

static unsigned int capacity_margin			= 1280;



static inline void update_load_add(struct load_weight *lw, unsigned long inc)

{

	lw->weight += inc;