The following commit has been merged in the linux branch: commit 8c5b0f9a85cd78e98123417a8e9d58857968ff13 Author: Leo Chen leochen@broadcom.com Date: Thu Oct 15 22:45:41 2009 +0100

ARM: 5764/1: bcmring: add oprofile pmu support

add oprofile pmu support for bcmring.

Signed-off-by: Leo Hao Chen leochen@broadcom.com Signed-off-by: Russell King rmk+kernel@arm.linux.org.uk

diff --git a/arch/arm/oprofile/op_model_v6.c b/arch/arm/oprofile/op_model_v6.c index fe58138..f7d2ec5 100644 --- a/arch/arm/oprofile/op_model_v6.c +++ b/arch/arm/oprofile/op_model_v6.c @@ -33,6 +33,9 @@ static int irqs[] = { #ifdef CONFIG_ARCH_OMAP2 3, #endif +#ifdef CONFIG_ARCH_BCMRING + IRQ_PMUIRQ, /* for BCMRING, ARM PMU interrupt is 43 */ +#endif };

static void armv6_pmu_stop(void)