Skip to content

Commit

Permalink
ARM: 7182/1: ARM cpu topology: fix warning
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Vincent Guittot authored and Russell King committed Nov 30, 2011
1 parent b5bed7f commit 4cbd6b1
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion arch/arm/include/asm/topology.h
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion arch/arm/kernel/topology.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down

0 comments on commit 4cbd6b1

Please sign in to comment.