]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
sh: fix function signature of cpu_coregroup_mask to match pointer type
authorRich Felker <dalias@libc.org>
Tue, 29 Mar 2016 22:50:02 +0000 (22:50 +0000)
committerRich Felker <dalias@libc.org>
Wed, 30 Mar 2016 00:47:49 +0000 (00:47 +0000)
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>
arch/sh/include/asm/topology.h
arch/sh/kernel/topology.c

index b0a282d65f6a16bc0753faac736e67adc00f62e7..358e3f516ef6ca78b3c7844d174140cc99f759c8 100644 (file)
@@ -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];
 
index 772caffba22fb644a077bfe8707148f75a1dc14a..c82912a61d74f26a3d3b1b3e47913c899329ecf6 100644 (file)
@@ -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];
 }