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

Commit b6220ad6 authored by Guenter Roeck's avatar Guenter Roeck Committed by Ingo Molnar
Browse files

sched: Fix compiler warnings 



Commit 143e1e28 (sched: Rework sched_domain topology definition)
introduced a number of functions with a return value of 'const int'.
gcc doesn't know what to do with that and, if the kernel is compiled
with W=1, complains with the following warnings whenever sched.h
is included.

  include/linux/sched.h:875:25: warning: type qualifiers ignored on function return type
  include/linux/sched.h:882:25: warning: type qualifiers ignored on function return type
  include/linux/sched.h:889:25: warning: type qualifiers ignored on function return type
  include/linux/sched.h:1002:21: warning: type qualifiers ignored on function return type

Commits fb2aa855 (sched, ARM: Create a dedicated scheduler topology table)
and 607b45e9 (sched, powerpc: Create a dedicated topology table) introduce
the same warning in the arm and powerpc code.

Drop 'const' from the function declarations to fix the problem.

The fix for all three patches has to be applied together to avoid
compilation failures for the affected architectures.

Acked-by: default avatarVincent Guittot <vincent.guittot@linaro.org>
Acked-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Dietmar Eggemann <dietmar.eggemann@arm.com>
Signed-off-by: default avatarPeter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/1403658329-13196-1-git-send-email-linux@roeck-us.net


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 3896c329

arch/arm/kernel/topology.c

+1 −1
Original line number Diff line number Diff line
@@ -275,7 +275,7 @@ void store_cpu_topology(unsigned int cpuid) 
		cpu_topology[cpuid].socket_id, mpidr);

}



static inline const int cpu_corepower_flags(void)

static inline int cpu_corepower_flags(void)

{

	return SD_SHARE_PKG_RESOURCES  | SD_SHARE_POWERDOMAIN;

}

arch/powerpc/kernel/smp.c

+1 −1
Original line number Diff line number Diff line
@@ -747,7 +747,7 @@ int setup_profiling_timer(unsigned int multiplier) 


#ifdef CONFIG_SCHED_SMT

/* cpumask of CPUs with asymetric SMT dependancy */

static const int powerpc_smt_flags(void)

static int powerpc_smt_flags(void)

{

	int flags = SD_SHARE_CPUCAPACITY | SD_SHARE_PKG_RESOURCES;

include/linux/sched.h

+4 −4
Original line number Diff line number Diff line
@@ -872,21 +872,21 @@ enum cpu_idle_type { 
#define SD_NUMA			0x4000	/* cross-node balancing */



#ifdef CONFIG_SCHED_SMT

static inline const int cpu_smt_flags(void)

static inline int cpu_smt_flags(void)

{

	return SD_SHARE_CPUCAPACITY | SD_SHARE_PKG_RESOURCES;

}

#endif



#ifdef CONFIG_SCHED_MC

static inline const int cpu_core_flags(void)

static inline int cpu_core_flags(void)

{

	return SD_SHARE_PKG_RESOURCES;

}

#endif



#ifdef CONFIG_NUMA

static inline const int cpu_numa_flags(void)

static inline int cpu_numa_flags(void)

{

	return SD_NUMA;

}
@@ -999,7 +999,7 @@ void free_sched_domains(cpumask_var_t doms[], unsigned int ndoms); 
bool cpus_share_cache(int this_cpu, int that_cpu);



typedef const struct cpumask *(*sched_domain_mask_f)(int cpu);

typedef const int (*sched_domain_flags_f)(void);

typedef int (*sched_domain_flags_f)(void);



#define SDTL_OVERLAP	0x01