* [PATCH] sched: Fix compiler warnings
@ 2014-06-12 23:08 Guenter Roeck
2014-06-13 8:05 ` Vincent Guittot
0 siblings, 1 reply; 4+ messages in thread
From: Guenter Roeck @ 2014-06-12 23:08 UTC (permalink / raw)
To: linux-kernel; +Cc: Peter Zijlstra, Ingo Molnar, Guenter Roeck, Vincent Guittot
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 <vincent.guittot@linaro.org>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
---
include/linux/sched.h | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/include/linux/sched.h b/include/linux/sched.h
index ea74596..65046b3 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -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
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] sched: Fix compiler warnings
2014-06-12 23:08 [PATCH] sched: Fix compiler warnings Guenter Roeck
@ 2014-06-13 8:05 ` Vincent Guittot
2014-06-13 15:13 ` Guenter Roeck
0 siblings, 1 reply; 4+ messages in thread
From: Vincent Guittot @ 2014-06-13 8:05 UTC (permalink / raw)
To: Guenter Roeck; +Cc: linux-kernel, Peter Zijlstra, Ingo Molnar
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 <vincent.guittot@linaro.org>
Vincent
diff --git a/arch/arm/kernel/topology.c b/arch/arm/kernel/topology.c
index 1576d05..7e56b2f 100644
--- a/arch/arm/kernel/topology.c
+++ b/arch/arm/kernel/topology.c
@@ -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;
}
diff --git a/arch/powerpc/kernel/smp.c b/arch/powerpc/kernel/smp.c
index 10ffffe..49d5d4e 100644
--- a/arch/powerpc/kernel/smp.c
+++ b/arch/powerpc/kernel/smp.c
@@ -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;
On 13 June 2014 01:08, Guenter Roeck <linux@roeck-us.net> wrote:
> 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 <vincent.guittot@linaro.org>
> Signed-off-by: Guenter Roeck <linux@roeck-us.net>
> ---
> include/linux/sched.h | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/include/linux/sched.h b/include/linux/sched.h
> index ea74596..65046b3 100644
> --- a/include/linux/sched.h
> +++ b/include/linux/sched.h
> @@ -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
>
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] sched: Fix compiler warnings
2014-06-13 8:05 ` Vincent Guittot
@ 2014-06-13 15:13 ` Guenter Roeck
2014-06-13 15:17 ` Vincent Guittot
0 siblings, 1 reply; 4+ messages in thread
From: Guenter Roeck @ 2014-06-13 15:13 UTC (permalink / raw)
To: Vincent Guittot; +Cc: linux-kernel, Peter Zijlstra, Ingo Molnar
On 06/13/2014 01:05 AM, Vincent Guittot wrote:
> 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 <vincent.guittot@linaro.org>
>
I'd prefer to fix those instances with separate patches, since they
will normally be handled by different maintainers. That simplifies
acceptance.
Guenter
> Vincent
>
> diff --git a/arch/arm/kernel/topology.c b/arch/arm/kernel/topology.c
> index 1576d05..7e56b2f 100644
> --- a/arch/arm/kernel/topology.c
> +++ b/arch/arm/kernel/topology.c
> @@ -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;
> }
> diff --git a/arch/powerpc/kernel/smp.c b/arch/powerpc/kernel/smp.c
> index 10ffffe..49d5d4e 100644
> --- a/arch/powerpc/kernel/smp.c
> +++ b/arch/powerpc/kernel/smp.c
> @@ -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;
>
>
> On 13 June 2014 01:08, Guenter Roeck <linux@roeck-us.net> wrote:
>> 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 <vincent.guittot@linaro.org>
>> Signed-off-by: Guenter Roeck <linux@roeck-us.net>
>> ---
>> include/linux/sched.h | 8 ++++----
>> 1 file changed, 4 insertions(+), 4 deletions(-)
>>
>> diff --git a/include/linux/sched.h b/include/linux/sched.h
>> index ea74596..65046b3 100644
>> --- a/include/linux/sched.h
>> +++ b/include/linux/sched.h
>> @@ -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
>>
>
>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] sched: Fix compiler warnings
2014-06-13 15:13 ` Guenter Roeck
@ 2014-06-13 15:17 ` Vincent Guittot
0 siblings, 0 replies; 4+ messages in thread
From: Vincent Guittot @ 2014-06-13 15:17 UTC (permalink / raw)
To: Guenter Roeck; +Cc: linux-kernel, Peter Zijlstra, Ingo Molnar
On 13 June 2014 17:13, Guenter Roeck <linux@roeck-us.net> wrote:
> On 06/13/2014 01:05 AM, Vincent Guittot wrote:
>>
>> 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 <vincent.guittot@linaro.org>
>>
>
> 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
>
> Guenter
>
>
>> Vincent
>>
>> diff --git a/arch/arm/kernel/topology.c b/arch/arm/kernel/topology.c
>> index 1576d05..7e56b2f 100644
>> --- a/arch/arm/kernel/topology.c
>> +++ b/arch/arm/kernel/topology.c
>> @@ -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;
>> }
>> diff --git a/arch/powerpc/kernel/smp.c b/arch/powerpc/kernel/smp.c
>> index 10ffffe..49d5d4e 100644
>> --- a/arch/powerpc/kernel/smp.c
>> +++ b/arch/powerpc/kernel/smp.c
>> @@ -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;
>>
>>
>> On 13 June 2014 01:08, Guenter Roeck <linux@roeck-us.net> wrote:
>>>
>>> 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 <vincent.guittot@linaro.org>
>>> Signed-off-by: Guenter Roeck <linux@roeck-us.net>
>>> ---
>>> include/linux/sched.h | 8 ++++----
>>> 1 file changed, 4 insertions(+), 4 deletions(-)
>>>
>>> diff --git a/include/linux/sched.h b/include/linux/sched.h
>>> index ea74596..65046b3 100644
>>> --- a/include/linux/sched.h
>>> +++ b/include/linux/sched.h
>>> @@ -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
>>>
>>
>>
>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-06-13 15:17 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-06-12 23:08 [PATCH] sched: Fix compiler warnings Guenter Roeck
2014-06-13 8:05 ` Vincent Guittot
2014-06-13 15:13 ` Guenter Roeck
2014-06-13 15:17 ` Vincent Guittot
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).