patch-2.3.23 linux/include/asm-sh/bitops.h

• Lines: 87
• Date: Mon Oct 18 11:16:13 1999
• Orig file: v2.3.22/linux/include/asm-sh/bitops.h
• Orig date: Tue Aug 31 17:29:14 1999

diff -u --recursive --new-file v2.3.22/linux/include/asm-sh/bitops.h linux/include/asm-sh/bitops.h
@@ -14,8 +14,7 @@
 
 	a += nr >> 5;
 	mask = 1 << (nr & 0x1f);
-	save_flags(flags);
-	cli();
+	save_and_cli(flags);
 	*a |= mask;
 	restore_flags(flags);
 }
@@ -28,8 +27,7 @@
 
 	a += nr >> 5;
 	mask = 1 << (nr & 0x1f);
-	save_flags(flags);
-	cli();
+	save_and_cli(flags);
 	*a &= ~mask;
 	restore_flags(flags);
 }
@@ -42,8 +40,7 @@
 
 	a += nr >> 5;
 	mask = 1 << (nr & 0x1f);
-	save_flags(flags);
-	cli();
+	save_and_cli(flags);
 	*a ^= mask;
 	restore_flags(flags);
 }
@@ -56,8 +53,7 @@
 
 	a += nr >> 5;
 	mask = 1 << (nr & 0x1f);
-	save_flags(flags);
-	cli();
+	save_and_cli(flags);
 	retval = (mask & *a) != 0;
 	*a |= mask;
 	restore_flags(flags);
@@ -73,8 +69,7 @@
 
 	a += nr >> 5;
 	mask = 1 << (nr & 0x1f);
-	save_flags(flags);
-	cli();
+	save_and_cli(flags);
 	retval = (mask & *a) != 0;
 	*a &= ~mask;
 	restore_flags(flags);
@@ -90,8 +85,7 @@
 
 	a += nr >> 5;
 	mask = 1 << (nr & 0x1f);
-	save_flags(flags);
-	cli();
+	save_and_cli(flags);
 	retval = (mask & *a) != 0;
 	*a ^= mask;
 	restore_flags(flags);
@@ -112,7 +106,7 @@
 	__asm__("1:\n"
 		"shlr	%1\n\t"
 		"bt/s	1b\n\t"
-		"add	#1, %0"
+		" add	#1, %0"
 		: "=r" (result)
 		: "r" (word), "0" (~0L));
 	return result;
@@ -165,7 +159,7 @@
 
 	ADDR += nr >> 3;
 	mask = 1 << (nr & 0x07);
-	save_flags(flags); cli();
+	save_and_cli(flags);
 	retval = (mask & *ADDR) != 0;
 	*ADDR |= mask;
 	restore_flags(flags);
@@ -180,7 +174,7 @@
 
 	ADDR += nr >> 3;
 	mask = 1 << (nr & 0x07);
-	save_flags(flags); cli();
+	save_and_cli(flags);
 	retval = (mask & *ADDR) != 0;
 	*ADDR &= ~mask;
 	restore_flags(flags);