From 4c4c72ea8a1d933d604a9f1890e0b407da9d7603 Mon Sep 17 00:00:00 2001
From: Tony Lindgren <tony@atomide.com>
Date: Tue, 4 Nov 2008 13:35:07 -0800
Subject: [PATCH] --- yaml --- r: 118523 b: refs/heads/master c:
 52414739ca3df12f6d1e78d4dc670e97af0e845f h: refs/heads/master i:   118521:
 fd4e8409a2d4610e2cf9dd2554f568c7bc02dd8c   118519:
 0128a3431f09c1a23f8d068eed391948fa602916 v: v3

---
 [refs]                                              | 2 +-
 trunk/arch/arm/plat-omap/include/mach/entry-macro.S | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 7ad481e149a6..a5b033bda545 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e621f266d4cd18a07a833877c3995d2ccb35b951
+refs/heads/master: 52414739ca3df12f6d1e78d4dc670e97af0e845f
diff --git a/trunk/arch/arm/plat-omap/include/mach/entry-macro.S b/trunk/arch/arm/plat-omap/include/mach/entry-macro.S
index 030118ee204a..2276f89671d8 100644
--- a/trunk/arch/arm/plat-omap/include/mach/entry-macro.S
+++ b/trunk/arch/arm/plat-omap/include/mach/entry-macro.S
@@ -65,7 +65,8 @@
 #include <mach/omap34xx.h>
 #endif
 
-#define INTCPS_SIR_IRQ_OFFSET	0x0040		/* Active interrupt number */
+#define INTCPS_SIR_IRQ_OFFSET	0x0040		/* Active interrupt offset */
+#define	ACTIVEIRQ_MASK		0x7f		/* Active interrupt bits */
 
 		.macro	disable_fiq
 		.endm
@@ -88,6 +89,7 @@
 		cmp	\irqnr, #0x0
 2222:
 		ldrne	\irqnr, [\base, #INTCPS_SIR_IRQ_OFFSET]
+		and	\irqnr, \irqnr, #ACTIVEIRQ_MASK /* Clear spurious bits */
 
 		.endm