---

yaml --- r: 377115 b: refs/heads/master c: 230b303 h: refs/heads/master i: 377113: 5ae262c 377111: 0ef9454 v: v3
git-mirror · Jun 15, 2013 · e91d008 · e91d008
1 parent 3da5401
commit e91d008
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bf593907f7236e95698a76b7c7a2bbf8b1165327
+refs/heads/master: 230b3034793247f61e6a0b08c44cf415f6d92981
diff --git a/trunk/arch/powerpc/kernel/irq.c b/trunk/arch/powerpc/kernel/irq.c
@@ -162,7 +162,7 @@ notrace unsigned int __check_irq_replay(void)
 	 * in case we also had a rollover while hard disabled
 	 */
 	local_paca->irq_happened &= ~PACA_IRQ_DEC;
-	if (decrementer_check_overflow())
+	if ((happened & PACA_IRQ_DEC) || decrementer_check_overflow())
 		return 0x900;
 
 	/* Finally check if an external interrupt happened */