diff options
author | Akinobu Mita <mita@miraclelinux.com> | 2006-03-26 04:39:04 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-26 11:57:10 -0500 |
commit | 72b61a3cfd80d1321eb898be8ceae2064f0fbea1 (patch) | |
tree | 67b9eccba0fce5b03814ae6468acde4616417f3d | |
parent | 3156054b02e263387d6cd27fd1b05eba2bc25459 (diff) |
[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>
-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) | |||
101 | retval = (mask & *adr) != 0; | 101 | retval = (mask & *adr) != 0; |
102 | *adr |= mask; | 102 | *adr |= mask; |
103 | cris_atomic_restore(addr, flags); | 103 | cris_atomic_restore(addr, flags); |
104 | local_irq_restore(flags); | ||
105 | return retval; | 104 | return retval; |
106 | } | 105 | } |
107 | 106 | ||