Skip to contentSkip to conversation

sched: Fix compiler warnings

PATCH In review Guenter Roeck 7 participants 14 messages Jun 25, 2014 – Jul 2, 2014

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH v2 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

Commits fb2aa855 (sched, ARM: Create a dedicated scheduler topology table) and 607b45e9a (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.

Cc Dietmar Eggemann <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Ingo Molnar <[email protected]>
Cc Benjamin Herrenschmidt <[email protected]>
Cc Vincent Guittot <[email protected]>

---
v2: Fix problem in all affected architectures with a single patch
to avoid compilation errors.

 arch/arm/kernel/topology.c | 2 +-
 arch/powerpc/kernel/smp.c  | 2 +-
 include/linux/sched.h      | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)
arch/arm/kernel/topology.c +1 -1
index 9d85318..e35d880 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 51a3ff7..1007fb8 100644
@@ -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
index 306f4f0..0376b05 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_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
 
Signature · 1 line
1.9.1
Acked-by on v2 1/1
#1 lore raw

On Tue, 2014-06-24 at 18:05 -0700, Guenter Roeck wrote:

.../...

Quoted 8 lines

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.

Cc Dietmar Eggemann <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Ingo Molnar <[email protected]>
Quoted 5 lines
Cc Vincent Guittot <[email protected]>

---
v2: Fix problem in all affected architectures with a single patch
to avoid compilation errors.

maintainer
#2 lore raw
In reply to Guenter Roeck
Quoted 21 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

Commits fb2aa855 (sched, ARM: Create a dedicated scheduler topology table) and 607b45e9a (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.

Quoted 8 lines

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

Cc Dietmar Eggemann <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Ingo Molnar <[email protected]>
Cc Benjamin Herrenschmidt <[email protected]>
Cc Vincent Guittot <[email protected]>

Acked-by Vincent Guittot <[email protected]>

Quoted 77 lines

---
v2: Fix problem in all affected architectures with a single patch
to avoid compilation errors.

 arch/arm/kernel/topology.c | 2 +-
 arch/powerpc/kernel/smp.c  | 2 +-
 include/linux/sched.h      | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)
arch/arm/kernel/topology.c +1 -1
index 9d85318..e35d880 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 51a3ff7..1007fb8 100644
@@ -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 -5
index 306f4f0..0376b05 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_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.1

#3 lore raw
In reply to Guenter Roeck
Quoted 44 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

Commits fb2aa855 (sched, ARM: Create a dedicated scheduler topology table) and 607b45e9a (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.

Cc Dietmar Eggemann <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Ingo Molnar <[email protected]>
Cc Benjamin Herrenschmidt <[email protected]>
Cc Vincent Guittot <[email protected]>

---
v2: Fix problem in all affected architectures with a single patch
to avoid compilation errors.

 arch/arm/kernel/topology.c | 2 +-
 arch/powerpc/kernel/smp.c  | 2 +-
 include/linux/sched.h      | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)
arch/arm/kernel/topology.c +0 -0
index 9d85318..e35d880 100644

arch/arm/kernel/topology.c void store_cpu_topology(unsigned int cpuid) · line 281

Quoted 8 lines
arch/arm/kernel/topology.c +1 -1
@@ -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;
 }

Maybe the author's intention was:

	static inline int cpu_corepower_flags(void) __attribute__((const));

?
This specifies that the function has no side effects and the return value only depends on the (here non-existing) function arguments.

Best regards
Uwe

Signature · 2 lines
Pengutronix e.K.                           | Uwe Kleine-K?nig            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
#4 lore raw
Quoted 55 lines · Uwe Kleine-K?nig
Quoted 44 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

Commits fb2aa855 (sched, ARM: Create a dedicated scheduler topology table) and 607b45e9a (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.

Cc Dietmar Eggemann <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Ingo Molnar <[email protected]>
Cc Benjamin Herrenschmidt <[email protected]>
Cc Vincent Guittot <[email protected]>

---
v2: Fix problem in all affected architectures with a single patch
to avoid compilation errors.

  arch/arm/kernel/topology.c | 2 +-
  arch/powerpc/kernel/smp.c  | 2 +-
  include/linux/sched.h      | 8 ++++----
  3 files changed, 6 insertions(+), 6 deletions(-)
arch/arm/kernel/topology.c +0 -0
index 9d85318..e35d880 100644

arch/arm/kernel/topology.c void store_cpu_topology(unsigned int cpuid) · line 281

Quoted 8 lines
arch/arm/kernel/topology.c +1 -1
@@ -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;
  }

Maybe the author's intention was:

Quoted 6 lines
	static inline int cpu_corepower_flags(void) __attribute__((const));

?
This specifies that the function has no side effects and the return value only depends on the (here non-existing) function arguments.

Possibly, but either I am missing something or this doesn't compile.

Guenter

#5 lore raw

Hello Guenter,

Quoted 10 lines · Guenter Roeck
Quoted 8 lines

Maybe the author's intention was:

	static inline int cpu_corepower_flags(void) __attribute__((const));

?
This specifies that the function has no side effects and the return value only depends on the (here non-existing) function arguments.

Possibly, but either I am missing something or this doesn't compile.

You need to do a separate declaration:

	static inline int cpu_corepower_flags(void) __attribute__((const));
	static inline int cpu_corepower_flags(void)
	{
		...

Does this help?

Best regards
Uwe

Signature · 2 lines
Pengutronix e.K.                           | Uwe Kleine-K?nig            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
#6 lore raw
Quoted 12 lines · Uwe Kleine-K?nig

Hello Guenter,

Quoted 9 lines · Guenter Roeck
Quoted 8 lines

Maybe the author's intention was:

	static inline int cpu_corepower_flags(void) __attribute__((const));

?
This specifies that the function has no side effects and the return value only depends on the (here non-existing) function arguments.

Quoted 7 lines
Quoted 1 line

Possibly, but either I am missing something or this doesn't compile.

You need to do a separate declaration:

	static inline int cpu_corepower_flags(void) __attribute__((const));
	static inline int cpu_corepower_flags(void)
	{
		...

Actually turns out one can use __attribute_const__, and it is

static inline int __attribute_const__ cpu_corepower_flags(void)

which turns out to be widely used.

I'll change that and resubmit after testing.

Guenter

#7 lore raw

From: Guenter Roeck

Quoted 21 lines · Uwe Kleine-Knig
Quoted 12 lines

Hello Guenter,

Quoted 9 lines · Guenter Roeck
Quoted 8 lines

Maybe the author's intention was:

	static inline int cpu_corepower_flags(void) __attribute__((const));

?
This specifies that the function has no side effects and the return value only depends on the (here non-existing) function arguments.

Quoted 7 lines
Quoted 1 line

Possibly, but either I am missing something or this doesn't compile.

You need to do a separate declaration:

	static inline int cpu_corepower_flags(void) __attribute__((const));
	static inline int cpu_corepower_flags(void)
	{
		...
Quoted 7 lines

Actually turns out one can use __attribute_const__, and it is

static inline int __attribute_const__ cpu_corepower_flags(void)

which turns out to be widely used.

I'll change that and resubmit after testing.

You don't need to tell the compiler that for an inline function.

David

#8 lore raw

Hello,

Quoted 10 lines · David Laight

From: Guenter Roeck

Quoted 7 lines

Actually turns out one can use __attribute_const__, and it is

static inline int __attribute_const__ cpu_corepower_flags(void)

which turns out to be widely used.

I'll change that and resubmit after testing.

You don't need to tell the compiler that for an inline function.

I didn't check for the functions in question here, but in general your statement is wrong.

For example:

static inline unsigned int __attribute_const__ read_cpuid_id(void)

{
	return readl(BASEADDR_V7M_SCB + V7M_SCB_CPUID);
}

from arch/arm/include/asm/cputype.h. The V7M_SCB_CPUID register never changes, but there is no way gcc can deduce that.

Best regards
Uwe

Signature · 2 lines
Pengutronix e.K.                           | Uwe Kleine-K?nig            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
#9 lore raw

From: Uwe Kleine-K?nig

Quoted 18 lines

Hello,

Quoted 10 lines · David Laight

From: Guenter Roeck

Quoted 7 lines

Actually turns out one can use __attribute_const__, and it is

static inline int __attribute_const__ cpu_corepower_flags(void)

which turns out to be widely used.

I'll change that and resubmit after testing.

You don't need to tell the compiler that for an inline function.

I didn't check for the functions in question here, but in general your statement is wrong.

For example:

Quoted 7 lines

static inline unsigned int __attribute_const__ read_cpuid_id(void)

{
	return readl(BASEADDR_V7M_SCB + V7M_SCB_CPUID);
}

from arch/arm/include/asm/cputype.h. The V7M_SCB_CPUID register never changes, but there is no way gcc can deduce that.

Hmm... it all rather depends on the order of the optimisations and inlining.

I've tried to use 'restrict' on the parameters to an inline function in an attempt to get 'noalias' - but the reverse inference never seems to be applied.

David

#10 lore raw
In reply to Uwe Kleine-König
Quoted 18 lines · Uwe Kleine-K?nig

Hello,

Quoted 10 lines · David Laight

From: Guenter Roeck

Quoted 7 lines

Actually turns out one can use __attribute_const__, and it is

static inline int __attribute_const__ cpu_corepower_flags(void)

which turns out to be widely used.

I'll change that and resubmit after testing.

You don't need to tell the compiler that for an inline function.

I didn't check for the functions in question here, but in general your statement is wrong.

For example:

Quoted 8 lines

static inline unsigned int __attribute_const__ read_cpuid_id(void)

{
	return readl(BASEADDR_V7M_SCB + V7M_SCB_CPUID);
}

from arch/arm/include/asm/cputype.h. The V7M_SCB_CPUID register never changes, but there is no way gcc can deduce that.

Sigh. As I mentioned earlier, it is much easier to introduce a problem than to fix it.

Ok, I'll leave this alone. I already spent much more time on this than I should or have, so it is really time to move on.

Guenter

#11 lore raw
In reply to Guenter Roeck

Hi Guenter,

[I know I'm a bit late to this, but ...]

Quoted 6 lines · On Tue, 24 Jun 2014 18:05:29 -0700 Guenter Roeck <[email protected]> wrote:
arch/arm/kernel/topology.c +0 -0
index 9d85318..e35d880 100644

arch/arm/kernel/topology.c void store_cpu_topology(unsigned int cpuid) · line 281

Quoted 8 lines
arch/arm/kernel/topology.c +1 -1
@@ -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;
 }

The only reference to this function is to take its address, so "inline" is useless, right?

Quoted 19 lines
include/linux/sched.h +2 -2
index 306f4f0..0376b05 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_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)
 {

include/linux/sched.h enum cpu_idle_type { · line 892

Quoted 10 lines
include/linux/sched.h +1 -1
 	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;
 }

The same is true of those three, but then they would have to be moved into a .c file and replaced with prototypes ...

Signature · 9 lines
Cheers,
Stephen Rothwell                    sfr at canb.auug.org.au
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140626/d0b1ed89/attachment.sig>
#12 lore raw
Quoted 46 lines · Stephen Rothwell

Hi Guenter,

[I know I'm a bit late to this, but ...]

Quoted 6 lines · On Tue, 24 Jun 2014 18:05:29 -0700 Guenter Roeck <[email protected]> wrote:
arch/arm/kernel/topology.c +0 -0
index 9d85318..e35d880 100644

arch/arm/kernel/topology.c void store_cpu_topology(unsigned int cpuid) · line 281

Quoted 8 lines
arch/arm/kernel/topology.c +1 -1
@@ -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;
  }

The only reference to this function is to take its address, so "inline" is useless, right?

Quoted 23 lines
include/linux/sched.h +2 -2
index 306f4f0..0376b05 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_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
 
Quoted 10 lines

include/linux/sched.h enum cpu_idle_type { · line 892

Quoted 6 lines
include/linux/sched.h +1 -1
  #ifdef CONFIG_NUMA
-static inline const int cpu_numa_flags(void)
+static inline int cpu_numa_flags(void)
  {
  	return SD_NUMA;
  }

The same is true of those three, but then they would have to be moved into a .c file and replaced with prototypes ...

Personally I wasn't sure why it had to be functions instead of defines, but who knows. Anyway, seems others are not happy with my proposed fix either, and everyone seems to suggest a different solution, so I guess it won't go anywhere.

I "solved" my immediate problem of getting a polluted build log by filtering the warnings out, so I don't really care too much anymore ;-).

Guenter

#13 lore raw
In reply to Guenter Roeck
sched: Fix compiler warnings
Commit-ID:  b6220ad66bcd4a50737eb3c08e9466aa44f3bc98
Gitweb:     http://git.kernel.org/tip/b6220ad66bcd4a50737eb3c08e9466aa44f3bc98
Author:     Guenter Roeck <[email protected]>
AuthorDate: Tue, 24 Jun 2014 18:05:29 -0700
Committer:  Ingo Molnar <[email protected]>
CommitDate: Wed, 2 Jul 2014 08:33:48 +0200

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

Commits fb2aa855 (sched, ARM: Create a dedicated scheduler topology table) and 607b45e9a (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.

---
 arch/arm/kernel/topology.c | 2 +-
 arch/powerpc/kernel/smp.c  | 2 +-
 include/linux/sched.h      | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)
arch/arm/kernel/topology.c +1 -1
index 9d85318..e35d880 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 51a3ff7..1007fb8 100644
@@ -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
index 306f4f0..0376b05 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_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