2014-06-25 09:18:25

by Nicolas Dichtel

Subject: [PATCH] sched: fix warnings in linux/sched.h

Seen when compiling with W=1.

Warnings were:
In file included from arch/x86/kernel/asm-offsets.c:9:0:
include/linux/sched.h:875:25: warning: type qualifiers ignored on function return type [-Wignored-qualifiers]
include/linux/sched.h:882:25: warning: type qualifiers ignored on function return type [-Wignored-qualifiers]
include/linux/sched.h:1002:21: warning: type qualifiers ignored on function return type [-Wignored-qualifiers]

It was introduced by commit 143e1e28cb40 ("sched: Rework sched_domain topology
definition").

CC: Vincent Guittot <[email protected]>
Signed-off-by: Nicolas Dichtel <[email protected]>
---
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 306f4f0c987a..0376b054a0d0 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_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

--
1.9.0

2014-07-01 15:45:56

by Nicolas Dichtel

Subject: Re: [PATCH] sched: fix warnings in linux/sched.h

Le 25/06/2014 11:10, Nicolas Dichtel a écrit :
> Seen when compiling with W=1.
>
> Warnings were:
> In file included from arch/x86/kernel/asm-offsets.c:9:0:
> include/linux/sched.h:875:25: warning: type qualifiers ignored on function return type [-Wignored-qualifiers]
> include/linux/sched.h:882:25: warning: type qualifiers ignored on function return type [-Wignored-qualifiers]
> include/linux/sched.h:1002:21: warning: type qualifiers ignored on function return type [-Wignored-qualifiers]
>
> It was introduced by commit 143e1e28cb40 ("sched: Rework sched_domain topology
> definition").
>
> CC: Vincent Guittot <[email protected]>
> Signed-off-by: Nicolas Dichtel <[email protected]>
Any comment or problem about this patch?

2014-07-01 15:58:11

by Vincent Guittot

Subject: Re: [PATCH] sched: fix warnings in linux/sched.h

On 1 July 2014 17:45, Nicolas Dichtel <[email protected]> wrote:
> Le 25/06/2014 11:10, Nicolas Dichtel a ?crit :
>
>> Seen when compiling with W=1.
>>
>> Warnings were:
>> In file included from arch/x86/kernel/asm-offsets.c:9:0:
>> include/linux/sched.h:875:25: warning: type qualifiers ignored on function
>> return type [-Wignored-qualifiers]
>> include/linux/sched.h:882:25: warning: type qualifiers ignored on function
>> return type [-Wignored-qualifiers]
>> include/linux/sched.h:1002:21: warning: type qualifiers ignored on
>> function return type [-Wignored-qualifiers]
>>
>> It was introduced by commit 143e1e28cb40 ("sched: Rework sched_domain
>> topology
>> definition").
>>
>> CC: Vincent Guittot <[email protected]>
>> Signed-off-by: Nicolas Dichtel <[email protected]>
>
> Any comment or problem about this patch?

This patch looks quit similar to https://lkml.org/lkml/2014/6/24/956

Vincent