From fd13913658ae1e92a112b23fe293a016e17ef795 Mon Sep 17 00:00:00 2001 From: Stephen Boyd Date: Tue, 5 Mar 2013 03:54:06 +0100 Subject: [PATCH] --- yaml --- r: 360886 b: refs/heads/master c: 44d6b1fc3e3c6a3af8e599b724972e881c81e1c9 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/kernel/perf_event.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 65e868ec4f3f..49a0ea1f427e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b8083f86e8e9b23ad4d75d334c92b601947dfa91 +refs/heads/master: 44d6b1fc3e3c6a3af8e599b724972e881c81e1c9 diff --git a/trunk/arch/arm/kernel/perf_event.c b/trunk/arch/arm/kernel/perf_event.c index a89206799db8..146157dfe27c 100644 --- a/trunk/arch/arm/kernel/perf_event.c +++ b/trunk/arch/arm/kernel/perf_event.c @@ -484,7 +484,7 @@ const struct dev_pm_ops armpmu_dev_pm_ops = { SET_RUNTIME_PM_OPS(armpmu_runtime_suspend, armpmu_runtime_resume, NULL) }; -static void __init armpmu_init(struct arm_pmu *armpmu) +static void armpmu_init(struct arm_pmu *armpmu) { atomic_set(&armpmu->active_events, 0); mutex_init(&armpmu->reserve_mutex);