From patchwork Mon Sep 13 06:07:34 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matt Fleming X-Patchwork-Id: 173822 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o8D67iSG013346 for ; Mon, 13 Sep 2010 06:07:44 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752920Ab0IMGHn (ORCPT ); Mon, 13 Sep 2010 02:07:43 -0400 Received: from arkanian.console-pimps.org ([212.110.184.194]:39309 "EHLO arkanian.console-pimps.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751672Ab0IMGHl (ORCPT ); Mon, 13 Sep 2010 02:07:41 -0400 Received: by arkanian.console-pimps.org (Postfix, from userid 1002) id 3BD3944330; Mon, 13 Sep 2010 07:07:40 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on arkanian.vm.bytemark.co.uk X-Spam-Level: X-Spam-Status: No, score=-4.2 required=5.0 tests=ALL_TRUSTED,AWL,BAYES_00 autolearn=ham version=3.2.5 Received: from localhost (cpc5-brad6-0-0-cust25.barn.cable.virginmedia.com [82.38.64.26]) by arkanian.console-pimps.org (Postfix) with ESMTPSA id A5B3648089; Mon, 13 Sep 2010 07:07:39 +0100 (BST) From: Matt Fleming To: Robert Richter Cc: Will Deacon , Paul Mundt , Russell King , linux-arm-kernel@lists.infradead.org, linux-sh@vger.kernel.org, Peter Zijlstra , Ingo Molnar , Frederic Weisbecker , Arnaldo Carvalho de Melo , linux-arch@vger.kernel.org Subject: [PATCH 3/6] ARM: oprofile: Move non-ARM code into separate init/exit functions Date: Mon, 13 Sep 2010 07:07:34 +0100 Message-Id: <7f520b235254cdbf6444ed9f4839fb5c12ff1199.1284357372.git.matt@console-pimps.org> X-Mailer: git-send-email 1.7.1 In-Reply-To: References: In-Reply-To: References: Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Mon, 13 Sep 2010 06:07:44 +0000 (UTC) diff --git a/arch/arm/oprofile/common.c b/arch/arm/oprofile/common.c index ed8291a..4d814c3 100644 --- a/arch/arm/oprofile/common.c +++ b/arch/arm/oprofile/common.c @@ -346,7 +346,7 @@ static void arm_backtrace(struct pt_regs * const regs, unsigned int depth) tail = user_backtrace(tail); } -int __init oprofile_arch_init(struct oprofile_operations *ops) +int __init oprofile_perf_init(struct oprofile_operations *ops) { int cpu, ret = 0; @@ -377,13 +377,16 @@ int __init oprofile_arch_init(struct oprofile_operations *ops) } } - ops->backtrace = arm_backtrace; - ops->create_files = oprofile_perf_create_files; - ops->setup = oprofile_perf_setup; - ops->start = oprofile_perf_start; - ops->stop = oprofile_perf_stop; - ops->shutdown = oprofile_perf_stop; - ops->cpu_type = op_name_from_perf_id(armpmu_get_pmu_id()); + if (!ops->create_files) + ops->create_files = oprofile_perf_create_files; + if (!ops->setup) + ops->setup = oprofile_perf_setup; + if (!ops->start) + ops->start = oprofile_perf_start; + if (!ops->stop) + ops->stop = oprofile_perf_stop; + if (!ops->shutdown) + ops->shutdown = oprofile_perf_stop; if (!ops->cpu_type) ret = -ENODEV; @@ -400,7 +403,15 @@ out: return ret; } -void __exit oprofile_arch_exit(void) +int __init oprofile_arch_init(struct oprofile_operations *ops) +{ + ops->backtrace = arm_backtrace; + ops->cpu_type = op_name_from_perf_id(armpmu_get_pmu_id()); + + return oprofile_perf_init(ops); +} + +void __exit oprofile_perf_exit(void) { int cpu, id; struct perf_event *event; @@ -418,6 +429,11 @@ void __exit oprofile_arch_exit(void) kfree(counter_config); exit_driverfs(); } + +void __exit oprofile_arch_exit(void) +{ + oprofile_perf_exit(); +} #else int __init oprofile_arch_init(struct oprofile_operations *ops) {