diff options
| author | Rich Felker <dalias@libc.org> | 2016-03-29 22:50:02 +0000 |
|---|---|---|
| committer | Rich Felker <dalias@libc.org> | 2016-03-30 00:47:49 +0000 |
| commit | ccc7d5a1cdae78ccd623540dc87e281135a1c053 (patch) | |
| tree | 8d7c2b1caf8f488f27cccc8039b2a8447fb28135 | |
| parent | ef21b32a60fbfdf2370465e52036c1c5ed1f6b43 (diff) | |
sh: fix function signature of cpu_coregroup_mask to match pointer type
The signedness mismatch of the argument type produces an error
compiling kernel/sched/core.c with -Werror=incompatible-pointer-types,
which is now used by default.
Fixes: ea8daa7b9784 "kbuild: Add option to turn incompatible pointer check into error"
Signed-off-by: Rich Felker <dalias@libc.org>
| -rw-r--r-- | arch/sh/include/asm/topology.h | 2 | ||||
| -rw-r--r-- | arch/sh/kernel/topology.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/sh/include/asm/topology.h b/arch/sh/include/asm/topology.h index b0a282d65f6a..358e3f516ef6 100644 --- a/arch/sh/include/asm/topology.h +++ b/arch/sh/include/asm/topology.h @@ -17,7 +17,7 @@ #define mc_capable() (1) -const struct cpumask *cpu_coregroup_mask(unsigned int cpu); +const struct cpumask *cpu_coregroup_mask(int cpu); extern cpumask_t cpu_core_map[NR_CPUS]; diff --git a/arch/sh/kernel/topology.c b/arch/sh/kernel/topology.c index 772caffba22f..c82912a61d74 100644 --- a/arch/sh/kernel/topology.c +++ b/arch/sh/kernel/topology.c @@ -21,7 +21,7 @@ static DEFINE_PER_CPU(struct cpu, cpu_devices); cpumask_t cpu_core_map[NR_CPUS]; EXPORT_SYMBOL(cpu_core_map); -static cpumask_t cpu_coregroup_map(unsigned int cpu) +static cpumask_t cpu_coregroup_map(int cpu) { /* * Presently all SH-X3 SMP cores are multi-cores, so just keep it @@ -30,7 +30,7 @@ static cpumask_t cpu_coregroup_map(unsigned int cpu) return *cpu_possible_mask; } -const struct cpumask *cpu_coregroup_mask(unsigned int cpu) +const struct cpumask *cpu_coregroup_mask(int cpu) { return &cpu_core_map[cpu]; } |