diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2006-01-04 20:31:28 +0100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-01-09 15:44:43 +1100 |
| commit | 8837d9216f99048636fbb2c11347358e99e06181 (patch) | |
| tree | 26e5cab20e59879f5e3271ea73c0320ae31da140 /arch/powerpc/platforms/cell/spu_base.c | |
| parent | 3f51dd91c80746a5cf76f8c4a77bfc88aa82bb9e (diff) | |
| download | lwn-8837d9216f99048636fbb2c11347358e99e06181.tar.gz lwn-8837d9216f99048636fbb2c11347358e99e06181.zip | |
[PATCH] spufs: clean up use of bitops
checking bits manually might not be synchonized with
the use of set_bit/clear_bit. Make sure we always use
the correct bitops by removing the unnecessary
identifiers.
Signed-off-by: Arnd Bergmann <arndb@de.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/platforms/cell/spu_base.c')
| -rw-r--r-- | arch/powerpc/platforms/cell/spu_base.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/powerpc/platforms/cell/spu_base.c b/arch/powerpc/platforms/cell/spu_base.c index 3a5302151e09..ae8354740721 100644 --- a/arch/powerpc/platforms/cell/spu_base.c +++ b/arch/powerpc/platforms/cell/spu_base.c @@ -63,7 +63,7 @@ static void spu_restart_dma(struct spu *spu) { struct spu_priv2 __iomem *priv2 = spu->priv2; - if (!test_bit(SPU_CONTEXT_SWITCH_PENDING_nr, &spu->flags)) + if (!test_bit(SPU_CONTEXT_SWITCH_PENDING, &spu->flags)) out_be64(&priv2->mfc_control_RW, MFC_CNTL_RESTART_DMA_COMMAND); } @@ -75,7 +75,7 @@ static int __spu_trap_data_seg(struct spu *spu, unsigned long ea) pr_debug("%s\n", __FUNCTION__); - if (test_bit(SPU_CONTEXT_SWITCH_ACTIVE_nr, &spu->flags)) { + if (test_bit(SPU_CONTEXT_SWITCH_ACTIVE, &spu->flags)) { /* SLBs are pre-loaded for context switch, so * we should never get here! */ @@ -122,7 +122,7 @@ static int __spu_trap_data_map(struct spu *spu, unsigned long ea, u64 dsisr) return 0; } - if (test_bit(SPU_CONTEXT_SWITCH_ACTIVE_nr, &spu->flags)) { + if (test_bit(SPU_CONTEXT_SWITCH_ACTIVE, &spu->flags)) { printk("%s: invalid access during switch!\n", __func__); return 1; } |