Messages in this thread Patch in this message | | | Date | Fri, 9 Jul 2010 17:31:27 +1000 | From | Paul Mackerras <> | Subject | Re: [RFC][PATCH 08/11] perf: Per PMU disable |
| |
On Thu, Jun 24, 2010 at 04:28:12PM +0200, Peter Zijlstra wrote:
> Changes perf_disable() into perf_pmu_disable().
Needs this rolled in to compile on powerpc.
Paul.
diff --git a/arch/powerpc/kernel/perf_event.c b/arch/powerpc/kernel/perf_event.c index 8890456..9046aea 100644 --- a/arch/powerpc/kernel/perf_event.c +++ b/arch/powerpc/kernel/perf_event.c @@ -517,7 +517,7 @@ static void write_mmcr0(struct cpu_hw_events *cpuhw, unsigned long mmcr0) * Disable all events to prevent PMU interrupts and to allow * events to be added or removed. */ -static void powerpc_pmu_pmu_disable(struct pmu *pmu) +static void power_pmu_pmu_disable(struct pmu *pmu) { struct cpu_hw_events *cpuhw; unsigned long flags; @@ -565,7 +565,7 @@ static void powerpc_pmu_pmu_disable(struct pmu *pmu) * If we were previously disabled and events were added, then * put the new config on the PMU. */ -static void powerpc_pmu_pmu_enable(struct pmu *pmu) +static void power_pmu_pmu_enable(struct pmu *pmu) { struct perf_event *event; struct cpu_hw_events *cpuhw; @@ -1130,7 +1130,7 @@ static int power_pmu_event_init(struct perf_event *event) struct pmu power_pmu = { .pmu_enable = power_pmu_pmu_enable, .pmu_disable = power_pmu_pmu_disable, - .event_init = pmwer_pmu_event_init, + .event_init = power_pmu_event_init, .enable = power_pmu_enable, .disable = power_pmu_disable, .read = power_pmu_read,
| |