diff options
| author |   Akinobu Mita <mita@miraclelinux.com> | 2006-03-26 01:39:04 -0800 |
|---|---|---|
| committer |   Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-26 08:57:10 -0800 |
| commit | 72b61a3cfd80d1321eb898be8ceae2064f0fbea1 (patch) | |
| tree | 67b9eccba0fce5b03814ae6468acde4616417f3d /include/asm-cris | |
| parent | [PATCH] bitops: parisc: add ()-pair in __ffz() macro (diff) | |
| download | linux-dev-72b61a3cfd80d1321eb898be8ceae2064f0fbea1.tar.xz linux-dev-72b61a3cfd80d1321eb898be8ceae2064f0fbea1.zip | |
[PATCH] bitops: cris: remove unnecessary local_irq_restore()
remove unnecessary local_irq_restore() after cris_atomic_restore() in
test_and_set_bit().
Signed-off-by: Akinobu Mita <mita@miraclelinux.com>
Cc: Mikael Starvik <starvik@axis.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/asm-cris')
| -rw-r--r-- | include/asm-cris/bitops.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-cris/bitops.h b/include/asm-cris/bitops.h index b7fef1572dc0..f8a674769314 100644 --- a/include/asm-cris/bitops.h +++ b/include/asm-cris/bitops.h @@ -101,7 +101,6 @@ static inline int test_and_set_bit(int nr, volatile unsigned long *addr) retval = (mask & *adr) != 0; *adr |= mask; cris_atomic_restore(addr, flags); - local_irq_restore(flags); return retval; } |