From 0a8a06005439f3626152507bccb737cb5dd8c73a Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <arnd.bergmann@de.ibm.com>
Date: Fri, 23 Jun 2006 20:57:50 +0200
Subject: [PATCH] --- yaml --- r: 31179 b: refs/heads/master c:
 2cd90bc8fba8720ef7f3fdfd1e0c1a5397a18271 h: refs/heads/master i:   31177:
 673458a647223e28902e0e24aa0ad547e46c829f   31175:
 33a453706b262cfdffd725ee2ea74fdd09600c26 v: v3

---
 [refs]                                       | 2 +-
 trunk/arch/powerpc/platforms/cell/spu_base.c | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index bb5f485e5ea5..02fc78152b53 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4da30d15b6d5036b0d96422d6946ca758111fae3
+refs/heads/master: 2cd90bc8fba8720ef7f3fdfd1e0c1a5397a18271
diff --git a/trunk/arch/powerpc/platforms/cell/spu_base.c b/trunk/arch/powerpc/platforms/cell/spu_base.c
index db82f503ba2c..b306723abb87 100644
--- a/trunk/arch/powerpc/platforms/cell/spu_base.c
+++ b/trunk/arch/powerpc/platforms/cell/spu_base.c
@@ -168,12 +168,12 @@ spu_irq_class_0_bottom(struct spu *spu)
 
 	stat &= mask;
 
-	if (stat & 1) /* invalid MFC DMA */
-		__spu_trap_invalid_dma(spu);
-
-	if (stat & 2) /* invalid DMA alignment */
+	if (stat & 1) /* invalid DMA alignment */
 		__spu_trap_dma_align(spu);
 
+	if (stat & 2) /* invalid MFC DMA */
+		__spu_trap_invalid_dma(spu);
+
 	if (stat & 4) /* error on SPU */
 		__spu_trap_error(spu);