From f82318fd712158bc8948e481bcd0d190312d0412 Mon Sep 17 00:00:00 2001
From: Will Deacon <will.deacon@arm.com>
Date: Thu, 25 Feb 2010 15:04:14 +0100
Subject: [PATCH] --- yaml --- r: 188391 b: refs/heads/master c:
 ddee87f208b6229d2910dd5930c87089dc56c87e h: refs/heads/master i:   188389:
 345a716d8b606d4fd4b850eb41e58a10d71faa7f   188387:
 83b900e4e59fe04f85ef0adebb76c8570a5d3018   188383:
 3a50c83b9a2d67373f7c8568fffa85e2965a1f4e v: v3

---
 [refs]                             | 2 +-
 trunk/arch/arm/kernel/perf_event.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 13d3108b2bc6..f95702f279c4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a91ed072d6135926c296a42b0b46de35e6347845
+refs/heads/master: ddee87f208b6229d2910dd5930c87089dc56c87e
diff --git a/trunk/arch/arm/kernel/perf_event.c b/trunk/arch/arm/kernel/perf_event.c
index c54ceb3d1f97..b44d15948b56 100644
--- a/trunk/arch/arm/kernel/perf_event.c
+++ b/trunk/arch/arm/kernel/perf_event.c
@@ -332,7 +332,8 @@ armpmu_reserve_hardware(void)
 
 	for (i = 0; i < pmu_irqs->num_irqs; ++i) {
 		err = request_irq(pmu_irqs->irqs[i], armpmu->handle_irq,
-				  IRQF_DISABLED, "armpmu", NULL);
+				  IRQF_DISABLED | IRQF_NOBALANCING,
+				  "armpmu", NULL);
 		if (err) {
 			pr_warning("unable to request IRQ%d for ARM "
 				   "perf counters\n", pmu_irqs->irqs[i]);