From: Tony Lindgren <tony@atomide.com>
Date: Wed, 4 Oct 2006 14:29:47 +0000 (+0300)
Subject: ARM: OMAP: Make oprofile work for ARM11
X-Git-Tag: v2.6.18-omap1~19
X-Git-Url: http://pilppa.org/gitweb/?a=commitdiff_plain;h=69bffebe6a4682a32e6ead30ea90a66c22b39402;p=linux-2.6-omap-h63xx.git

ARM: OMAP: Make oprofile work for ARM11

Make oprofile work for ARM11

Signed-off-by: Tony Lindgren <tony@atomide.com>
---

diff --git a/arch/arm/oprofile/op_model_v6.c b/arch/arm/oprofile/op_model_v6.c
index b9b156b320c..55279db7954 100644
--- a/arch/arm/oprofile/op_model_v6.c
+++ b/arch/arm/oprofile/op_model_v6.c
@@ -90,7 +90,11 @@ static struct pmu_type pmu_parms[] = {
 		.id		= PMU_ARM11,
 		.name		= "arm/arm11",
 		.num_counters	= 3,
+#ifdef CONFIG_ARCH_OMAP2
+		.interrupt	= 3,
+#else
 		.interrupt	= -1,
+#endif
 		.int_mask	= { [PMN0] = 0x10, [PMN1] = 0x20,
 				    [CCNT] = 0x40 },
 		.cnt_ovf	= { [CCNT] = 0x400, [PMN0] = 0x100,
@@ -238,7 +242,7 @@ static int arm11_pmu_start(void)
 	u32 pmnc = read_pmnc();
 
 	if (pmu->interrupt >= 0) {
-		ret = request_irq(pmu->interrupt, arm11_pmu_interrupt, SA_INTERRUPT,
+		ret = request_irq(pmu->interrupt, arm11_pmu_interrupt, IRQF_DISABLED,
 				  "ARM11 PMU", (void *)results);
 		if (ret < 0) {
 			printk(KERN_ERR "oprofile: unable to request IRQ%d for ARM11 PMU\n",
@@ -249,7 +253,6 @@ static int arm11_pmu_start(void)
 		pmnc |= pmu->int_enable;
 	}
 
-	printk("XXX enabling PMNC: %08x\n", pmnc);
 	pmnc |= PMU_ENABLE;
 	write_pmnc(pmnc);
 	pr_debug("arm11_pmu_start: pmnc: %#08x mask: %08x\n", pmnc, pmu->int_enable);
@@ -273,15 +276,3 @@ struct op_arm_model_spec op_arm11_spec = {
 	.start		= arm11_pmu_start,
 	.stop		= arm11_pmu_stop,
 };
-
-static int __init op_arm11_init(void)
-{
-	int ret;
-
-	ret = arm11_detect_pmu();
-	if (ret == 0)
-		ret = arm11_pmu_start();
-
-	return ret;
-}
-subsys_initcall(op_arm11_init);