patch-2.3.24 linux/include/asm-sh/system.h

• Lines: 46
• Date: Mon Oct 25 10:59:18 1999
• Orig file: v2.3.23/linux/include/asm-sh/system.h
• Orig date: Fri Oct 22 13:21:55 1999

diff -u --recursive --new-file v2.3.23/linux/include/asm-sh/system.h linux/include/asm-sh/system.h
@@ -98,7 +98,7 @@
 	__asm__ __volatile__("stc	sr,%0\n\t"
 			     "and	%1,%0\n\t"
 			     "ldc	%0,sr"
-			     : "=&z" (__dummy)
+			     : "=&r" (__dummy)
 			     : "r" (0xefffffff)
 			     : "memory");
 }
@@ -109,24 +109,24 @@
 	__asm__ __volatile__("stc	sr,%0\n\t"
 			     "or	%1,%0\n\t"
 			     "ldc	%0,sr"
-			     : "=&z" (__dummy)
+			     : "=&r" (__dummy)
 			     : "r" (0x10000000)
 			     : "memory");
 }
 
 #define __save_flags(x) \
-__asm__ __volatile__("stc	sr,%0\n\tnop\n\tnop\n\tnop\n\tnop\n\tnop":"=r" (x): /* no inputs */ :"memory")
+__asm__ __volatile__("stc	sr,%0":"=r" (x): /* no inputs */ :"memory")
 
-#define __save_and_cli(x)               \
-({	unsigned long __dummy;		\
-__asm__ __volatile__(                   \
-	"stc	sr,%0\n\t" \
-	"mov	%0,%1\n\t" \
-	"or	%2,%1\n\t" \
-	"ldc	%1,sr"     \
-	: "=&r" (x), "=&z" (__dummy) \
-	: "r" (0x10000000) \
-	: "memory"); })
+#define __save_and_cli(x)    				\
+x = (__extension__ ({	unsigned long __dummy,__sr;	\
+	__asm__ __volatile__(                   	\
+		"stc	sr,%1\n\t" 			\
+		"or	%0,%1\n\t" 			\
+		"stc	sr,%0\n\t" 			\
+		"ldc	%1,sr"     			\
+		: "=r" (__sr), "=&r" (__dummy) 		\
+		: "0" (0x10000000) 			\
+		: "memory"); __sr; }))
 
 #define __restore_flags(x) \
 __asm__ __volatile__("ldc	%0,sr": /* no output */: "r" (x):"memory")