From: Akinobu Mita <mita@miraclelinux.com>
Date: Sun, 26 Mar 2006 09:39:04 +0000 (-0800)
Subject: [PATCH] bitops: cris: remove unnecessary local_irq_restore()
X-Git-Tag: v2.6.17-rc1~527
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=72b61a3cfd80d1321eb898be8ceae2064f0fbea1;p=linux-2.6

[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 b7fef1572d..f8a6747693 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;
 }