From e91d00801d8441e277d8b1e23cafa1da04e5bcf5 Mon Sep 17 00:00:00 2001 From: Benjamin Herrenschmidt Date: Sat, 15 Jun 2013 12:13:40 +1000 Subject: [PATCH] --- yaml --- r: 377115 b: refs/heads/master c: 230b3034793247f61e6a0b08c44cf415f6d92981 h: refs/heads/master i: 377113: 5ae262ca073871b279d2e227395e78d3375424e3 377111: 0ef945405625986ae8a43b447f196d4c55a44c02 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kernel/irq.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index ccea3c9b40fb..046b6db06ef5 100644 --- 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 index 5cbcf4d5a808..ea185e0b3cae 100644 --- 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 */