Skip to contentSkip to conversation

sched: Fix compiler warnings

PATCH Superseded Guenter Roeck 2 participants 4 messages Jun 12, 2014 – Jun 13, 2014

Subsystems (3)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 sched: Fix compiler warnings

Commit 143e1e28cb (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

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

Cc Vincent Guittot <[email protected]>
---
 include/linux/sched.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
include/linux/sched.h +4 -4
index ea74596..65046b3 100644
@@ -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_CPUPOWER | 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
 
Signature · 1 line
1.9.1
maintainer
#1 lore raw

Hi Guenter,

There are also such kind of function in ARM and powerpc architecture

with the additional changes below, you can add my Acked-by Vincent Guittot <[email protected]>

Vincent

arch/arm/kernel/topology.c +1 -1
index 1576d05..7e56b2f 100644
@@ -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
index 10ffffe..49d5d4e 100644
@@ -768,7 +768,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_CPUPOWER | SD_SHARE_PKG_RESOURCES;
 
Quoted 64 lines · Guenter Roeck

Commit 143e1e28cb (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

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

Cc Vincent Guittot <[email protected]>
---
 include/linux/sched.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
include/linux/sched.h +4 -5
index ea74596..65046b3 100644
@@ -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_CPUPOWER | 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
 
--

1.9.1

#2 lore raw
Quoted 7 lines · Vincent Guittot

Hi Guenter,

There are also such kind of function in ARM and powerpc architecture

with the additional changes below, you can add my Acked-by Vincent Guittot <[email protected]>

I'd prefer to fix those instances with separate patches, since they will normally be handled by different maintainers. That simplifies acceptance.

Guenter

Quoted 96 lines

Vincent

arch/arm/kernel/topology.c +1 -1
index 1576d05..7e56b2f 100644
@@ -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
index 10ffffe..49d5d4e 100644
@@ -768,7 +768,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_CPUPOWER | SD_SHARE_PKG_RESOURCES;
 
Quoted 64 lines · Guenter Roeck

Commit 143e1e28cb (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

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

Cc Vincent Guittot <[email protected]>
---
  include/linux/sched.h | 8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)
include/linux/sched.h +4 -5
index ea74596..65046b3 100644
@@ -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_CPUPOWER | 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
 
--

1.9.1

maintainer
#3 lore raw
Quoted 6 lines · Guenter Roeck
Quoted 5 lines · Vincent Guittot

Hi Guenter,

There are also such kind of function in ARM and powerpc architecture

Quoted 7 lines
Quoted 3 lines

with the additional changes below, you can add my Acked-by Vincent Guittot <[email protected]>

I'd prefer to fix those instances with separate patches, since they will normally be handled by different maintainers. That simplifies acceptance.

Ok.
separate patches is fine for me too

Vincent

Quoted 104 lines

Guenter

Quoted 99 lines

Vincent

arch/arm/kernel/topology.c +1 -1
index 1576d05..7e56b2f 100644
@@ -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
index 10ffffe..49d5d4e 100644
@@ -768,7 +768,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_CPUPOWER | SD_SHARE_PKG_RESOURCES;
 
Quoted 67 lines · Guenter Roeck

Commit 143e1e28cb (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

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

Cc Vincent Guittot <[email protected]>
---
  include/linux/sched.h | 8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)
include/linux/sched.h +3 -3
index ea74596..65046b3 100644
@@ -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_CPUPOWER | 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;
  }
include/linux/sched.h +1 -2
@@ -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
 
--

1.9.1