From mboxrd@z Thu Jan 1 00:00:00 1970 From: will.deacon@arm.com (Will Deacon) Date: Tue, 25 Oct 2011 09:34:20 +0100 Subject: [PATCH v5 3/7] arm: perf: support device with other non-irq resources In-Reply-To: References: <1319467559-5518-1-git-send-email-ming.lei@canonical.com> <1319467559-5518-4-git-send-email-ming.lei@canonical.com> <20111024150814.GA4771@mudshark.cambridge.arm.com> Message-ID: <20111025083420.GA6184@mudshark.cambridge.arm.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Tue, Oct 25, 2011 at 02:09:22AM +0100, Ming Lei wrote: > >> - ? ? for (i = 0; i < pmu_device->num_resources; ++i) { > >> + ? ? for (i = 0; i < nr_cpu_ids; ++i) { > >> ? ? ? ? ? ? ? irq = platform_get_irq(pmu_device, i); > >> ? ? ? ? ? ? ? if (irq < 0) > >> ? ? ? ? ? ? ? ? ? ? ? continue; > > > > Hmm, I actually changed this code recently. Take a look: > > > > https://github.com/wdeacon/linux-wd/blob/perf/system-pmus/arch/arm/kernel/perf_event.c > > > > This should all be in for 3.2-rc1, so you can rebase then. If you still have > > hwmod issues, please solve them outside of perf_event.c > > Looks your patch has solved the problem, so the patch is not needed > any more. Hurrah! If you can get the OMAP / hwmod bits acked by the OMAP guys then I'm happy to take the perf and PMU changes into my tree. > I will try to rebase the patchset on your tree first. Well that stuff should be in for -rc1, so you're probably better off rebasing onto that when it lands. You could always use -next in the meantime. Cheers, Will