[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>

diff --git a/include/asm-cris/bitops.h b/include/asm-cris/bitops.h
index b7fef1572dc0f52d34ad9efa7eae87faf3ac684a..f8a6747693148350c3cce205b29bf82f6fa0a5f6 100644 (file)
--- 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;
 }