On 13 June 2014 17:13, Guenter Roeck <[email protected]> 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 <[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
>
> 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 <[email protected]> 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 <[email protected]>
>>> Signed-off-by: Guenter Roeck <[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 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
>>>
>>
>>
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
