[Cbe-oss-dev] [PATCH 5/9] spufs: fix restore_decr_wrapped()

[Masato Noguchi]

fixed restore_decr_wrapped() to match CBE Handbook.

Signed-off-by: Masato Noguchi <Masato.Noguchi at jp.sony.com>
---

 arch/powerpc/platforms/cell/spufs/switch.c |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

Index: linux-2.6/arch/powerpc/platforms/cell/spufs/switch.c
===================================================================
--- linux-2.6.orig/arch/powerpc/platforms/cell/spufs/switch.c
+++ linux-2.6/arch/powerpc/platforms/cell/spufs/switch.c
@@ -1539,15 +1539,15 @@ static inline void restore_decr_wrapped(
 	 *     "wrapped" flag is set, OR in a '1' to
 	 *     CSA.SPU_Event_Status[Tm].
 	 */
-	if (csa->lscsa->decr_status.slot[0] & SPU_DECR_STATUS_WRAPPED) {
-		csa->spu_chnldata_RW[0] |= 0x20;
-	}
 	if ((csa->lscsa->decr_status.slot[0] & SPU_DECR_STATUS_WRAPPED) &&
 	    (csa->spu_chnlcnt_RW[0] == 0 &&
-	     ((csa->spu_chnldata_RW[2] & 0x20) == 0x0) &&
-	     ((csa->spu_chnldata_RW[0] & 0x20) != 0x1))) {
+	     ((csa->spu_chnldata_RW[1] & 0x20) != 0x0) &&
+	     ((csa->spu_chnldata_RW[0] & 0x20) == 0x0))) {
 		csa->spu_chnlcnt_RW[0] = 1;
 	}
+	if (csa->lscsa->decr_status.slot[0] & SPU_DECR_STATUS_WRAPPED) {
+		csa->spu_chnldata_RW[0] |= 0x20;
+	}
 }
 
 static inline void restore_ch_part1(struct spu_state *csa, struct spu *spu)