summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Boyd2014-01-10 00:57:06 +0100
committerRussell King2014-01-11 13:06:58 +0100
commit261521f142fb426b58ed460d2476049dc8fa4fb9 (patch)
treef82345a1993746ccbb86da0a26b363c67877f14d
parentARM: 7934/1: DT/kernel: fix arch_match_cpu_phys_id to avoid erroneous match (diff)
downloadkernel-qcow2-linux-261521f142fb426b58ed460d2476049dc8fa4fb9.tar.gz
kernel-qcow2-linux-261521f142fb426b58ed460d2476049dc8fa4fb9.tar.xz
kernel-qcow2-linux-261521f142fb426b58ed460d2476049dc8fa4fb9.zip
ARM: 7937/1: perf_event: Silence sparse warning
arch/arm/kernel/perf_event_cpu.c:274:25: warning: incorrect type in assignment (different modifiers) arch/arm/kernel/perf_event_cpu.c:274:25: expected int ( *init_fn )( ... ) arch/arm/kernel/perf_event_cpu.c:274:25: got void const *const data Acked-by: Will Deacon <will.deacon@arm.com> Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r--arch/arm/kernel/perf_event_cpu.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/kernel/perf_event_cpu.c b/arch/arm/kernel/perf_event_cpu.c
index d85055cd24ba..20d553c9f5e2 100644
--- a/arch/arm/kernel/perf_event_cpu.c
+++ b/arch/arm/kernel/perf_event_cpu.c
@@ -254,7 +254,7 @@ static int probe_current_pmu(struct arm_pmu *pmu)
static int cpu_pmu_device_probe(struct platform_device *pdev)
{
const struct of_device_id *of_id;
- int (*init_fn)(struct arm_pmu *);
+ const int (*init_fn)(struct arm_pmu *);
struct device_node *node = pdev->dev.of_node;
struct arm_pmu *pmu;
int ret = -ENODEV;