From fac82d0081065cafeb0d0e1bc46df1d1cadc0992 Mon Sep 17 00:00:00 2001
From: Akinobu Mita <mita@miraclelinux.com>
Date: Sun, 26 Mar 2006 01:39:04 -0800
Subject: [PATCH] --- yaml --- r: 24155 b: refs/heads/master c:
 72b61a3cfd80d1321eb898be8ceae2064f0fbea1 h: refs/heads/master i:   24153:
 753bca45803580166c5a02df98cf101104d184ee   24151:
 693276e4fc4869b8ad5b89d9e8ca7578b7e67fbb v: v3

---
 [refs]                          | 2 +-
 trunk/include/asm-cris/bitops.h | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 8472959a43e9..dcef4da57a6a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3156054b02e263387d6cd27fd1b05eba2bc25459
+refs/heads/master: 72b61a3cfd80d1321eb898be8ceae2064f0fbea1
diff --git a/trunk/include/asm-cris/bitops.h b/trunk/include/asm-cris/bitops.h
index b7fef1572dc0..f8a674769314 100644
--- a/trunk/include/asm-cris/bitops.h
+++ b/trunk/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;
 }