3 files changed, 4 insertions, 17 deletions

diff --git a/arch/powerpc/platforms/cell/spu_base.c b/arch/powerpc/platforms/cell/spu_base.c
index e45cfa84911f..87eb07f94c5f 100644
--- a/arch/powerpc/platforms/cell/spu_base.c
+++ b/arch/powerpc/platforms/cell/spu_base.c
@@ -160,13 +160,6 @@ static int __spu_trap_data_seg(struct spu *spu, unsigned long ea)
 
         pr_debug("%s\n", __FUNCTION__);
 
-        if (test_bit(SPU_CONTEXT_SWITCH_ACTIVE, &spu->flags)) {
-                /* SLBs are pre-loaded for context switch, so
-                 * we should never get here!
-                 */
-                printk("%s: invalid access during switch!\n", __func__);
-                return 1;
-        }
         slb.esid = (ea & ESID_MASK) | SLB_ESID_V;
 
         switch(REGION_ID(ea)) {
@@ -226,11 +219,6 @@ static int __spu_trap_data_map(struct spu *spu, unsigned long ea, u64 dsisr)
                 return 0;
         }
 
-        if (test_bit(SPU_CONTEXT_SWITCH_ACTIVE, &spu->flags)) {
-                printk("%s: invalid access during switch!\n", __func__);
-                return 1;
-        }
-
         spu->class_0_pending = 0;
         spu->dar = ea;
         spu->dsisr = dsisr;
diff --git a/arch/powerpc/platforms/cell/spufs/switch.c b/arch/powerpc/platforms/cell/spufs/switch.c
index 6063c88c26d2..6f5886c7b1f9 100644
--- a/arch/powerpc/platforms/cell/spufs/switch.c
+++ b/arch/powerpc/platforms/cell/spufs/switch.c
@@ -720,8 +720,9 @@ static inline void set_switch_active(struct spu_state *csa, struct spu *spu)
          * Restore, Step 23.
          *     Change the software context switch pending flag
          *     to context switch active.
+         *
+         *     This implementation does not uses a switch active flag.
          */
-        set_bit(SPU_CONTEXT_SWITCH_ACTIVE, &spu->flags);
         clear_bit(SPU_CONTEXT_SWITCH_PENDING, &spu->flags);
         mb();
 }
@@ -1739,9 +1740,8 @@ static inline void reset_switch_active(struct spu_state *csa, struct spu *spu)
 {
         /* Restore, Step 74:
          *     Reset the "context switch active" flag.
+         *     Not performed by this implementation.
          */
-        clear_bit(SPU_CONTEXT_SWITCH_ACTIVE, &spu->flags);
-        mb();
 }
 
 static inline void reenable_interrupts(struct spu_state *csa, struct spu *spu)
diff --git a/include/asm-powerpc/spu.h b/include/asm-powerpc/spu.h
index f07c99ba5d13..e3c845b0f764 100644
--- a/include/asm-powerpc/spu.h
+++ b/include/asm-powerpc/spu.h
@@ -98,9 +98,8 @@
 #define MFC_PRIV_ATTN_EVENT                 0x00000800
 #define MFC_MULTI_SRC_EVENT                 0x00001000
 
-/* Flags indicating progress during context switch. */
+/* Flag indicating progress during context switch. */
 #define SPU_CONTEXT_SWITCH_PENDING      0UL
-#define SPU_CONTEXT_SWITCH_ACTIVE       1UL
 
 struct spu_context;
 struct spu_runqueue;