---

yaml --- r: 24155 b: refs/heads/master c: 72b61a3 h: refs/heads/master i: 24153: 753bca4 24151: 693276e v: v3
git-mirror · Mar 26, 2006 · fac82d0 · fac82d0
1 parent 4be9735
commit fac82d0
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git 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
@@ -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;
 }