From f54244ef12a22e3155e198a1a1438c27897c8d74 Mon Sep 17 00:00:00 2001 From: eric miao Date: Wed, 27 Feb 2008 01:59:28 +0100 Subject: [PATCH] --- yaml --- r: 86611 b: refs/heads/master c: a3359e21c06cb5b366fb47307b3d2fd23386a774 h: refs/heads/master i: 86609: 0148d575b2ea82f63b44afb9962b6fad0182625b 86607: 6af230f120a1940376e6b304aa4ca3cae7cf76d2 v: v3 --- [refs] | 2 +- trunk/include/asm-arm/arch-pxa/entry-macro.S | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index e46568263cd2..300202912ce8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9ae3ae0bebb9a3a348dc233229008b126014889d +refs/heads/master: a3359e21c06cb5b366fb47307b3d2fd23386a774 diff --git a/trunk/include/asm-arm/arch-pxa/entry-macro.S b/trunk/include/asm-arm/arch-pxa/entry-macro.S index b7e730851461..c145bb01bc8f 100644 --- a/trunk/include/asm-arm/arch-pxa/entry-macro.S +++ b/trunk/include/asm-arm/arch-pxa/entry-macro.S @@ -35,7 +35,7 @@ 1004: mrc p6, 0, \irqstat, c6, c0, 0 @ ICIP2 mrc p6, 0, \irqnr, c7, c0, 0 @ ICMR2 - ands \irqstat, \irqstat, \irqnr + ands \irqnr, \irqstat, \irqnr beq 1003f rsb \irqstat, \irqnr, #0 and \irqstat, \irqstat, \irqnr