summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorVincent Guittot <vincent.guittot@linaro.org>2011-11-29 15:50:20 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-11-30 23:55:21 +0000
commit4cbd6b167f9ed756ced970e0a95538f60ae3b9ab (patch)
tree261a7420aa3067b1c980fca2d4378b2d85a9f443 /arch
parentb5bed7fe801d1460424b7aeb6b06464e23d2a1e6 (diff)
downloadlinux-4cbd6b167f9ed756ced970e0a95538f60ae3b9ab.tar.gz
linux-4cbd6b167f9ed756ced970e0a95538f60ae3b9ab.tar.bz2
linux-4cbd6b167f9ed756ced970e0a95538f60ae3b9ab.zip
ARM: 7182/1: ARM cpu topology: fix warning
kernel/sched.c:7354:2: warning: initialization from incompatible pointer type Align cpu_coregroup_mask prototype interface with sched_domain_mask_f typedef use int cpu instead of unsigned int cpu Cc: <stable@vger.kernel.org> Signed-off-by: Vincent Guittot <vincent.guittot@linaro.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/include/asm/topology.h2
-rw-r--r--arch/arm/kernel/topology.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/include/asm/topology.h b/arch/arm/include/asm/topology.h
index a7e457ed27c3..58b8b84adcd2 100644
--- a/arch/arm/include/asm/topology.h
+++ b/arch/arm/include/asm/topology.h
@@ -25,7 +25,7 @@ extern struct cputopo_arm cpu_topology[NR_CPUS];
void init_cpu_topology(void);
void store_cpu_topology(unsigned int cpuid);
-const struct cpumask *cpu_coregroup_mask(unsigned int cpu);
+const struct cpumask *cpu_coregroup_mask(int cpu);
#else
diff --git a/arch/arm/kernel/topology.c b/arch/arm/kernel/topology.c
index 1040c00405d0..8200deaa14f6 100644
--- a/arch/arm/kernel/topology.c
+++ b/arch/arm/kernel/topology.c
@@ -43,7 +43,7 @@
struct cputopo_arm cpu_topology[NR_CPUS];
-const struct cpumask *cpu_coregroup_mask(unsigned int cpu)
+const struct cpumask *cpu_coregroup_mask(int cpu)
{
return &cpu_topology[cpu].core_sibling;
}