patch-2.4.0-test9 linux/include/asm-sh/uaccess.h

• Lines: 66
• Date: Mon Oct 2 11:57:34 2000
• Orig file: v2.4.0-test8/linux/include/asm-sh/uaccess.h
• Orig date: Tue Aug 29 14:09:16 2000

diff -u --recursive --new-file v2.4.0-test8/linux/include/asm-sh/uaccess.h linux/include/asm-sh/uaccess.h
@@ -45,11 +45,12 @@
  * sum := addr + size;  carry? --> flag = true;
  * if (sum >= addr_limit) flag = true;
  */
-#define __range_ok(addr,size) ({ \
-	unsigned long flag,sum; \
-	__asm__("clrt; addc %3, %1; movt %0; cmp/hi %4, %1; rotcl %0" \
-		:"=&r" (flag), "=r" (sum) \
-		:"1" (addr), "r" ((int)(size)), "r" (current->addr_limit.seg)); \
+#define __range_ok(addr,size) ({					      \
+	unsigned long flag,sum; 					      \
+	__asm__("clrt; addc %3, %1; movt %0; cmp/hi %4, %1; rotcl %0"	      \
+		:"=&r" (flag), "=r" (sum) 				      \
+		:"1" (addr), "r" ((int)(size)), "r" (current->addr_limit.seg) \
+		:"t"); 							      \
 	flag; })
 
 #define access_ok(type,addr,size) (__range_ok(addr,size) == 0)
@@ -186,7 +187,8 @@
 	".long	1b, 3b\n\t" \
 	".previous" \
 	:"=&r" (__pu_err) \
-	:"r" (__pu_val), "m" (__m(__pu_addr)), "i" (-EFAULT)); })
+	:"r" (__pu_val), "m" (__m(__pu_addr)), "i" (-EFAULT) \
+        :"memory"); })
 
 extern void __put_user_unknown(void);
 
@@ -224,7 +226,7 @@
 		".previous"
 		: "=r" (res), "=&z" (__dummy), "=r" (_f), "=r" (_t)
 		: "2" (__from), "3" (__to), "0" (res)
-		: "memory");
+		: "memory", "t");
 
 	return res;
 }
@@ -284,7 +286,8 @@
 		"	.long 1b,3b\n"
 		".previous"
 		: "=r" (size), "=r" (__a)
-		: "0" (size), "1" (addr), "r" (0));
+		: "0" (size), "1" (addr), "r" (0)
+		: "memory", "t");
 
 	return size;
 }
@@ -330,7 +333,7 @@
 		: "=r" (res), "=&z" (__dummy), "=r" (_s), "=r" (_d)
 		: "0" (__count), "2" (__src), "3" (__dest), "r" (__count),
 		  "i" (-EFAULT)
-		: "memory");
+		: "memory", "t");
 
 	return res;
 }
@@ -376,7 +379,8 @@
 		"	.long 1b,3b\n"
 		".previous"
 		: "=z" (res), "=&r" (__dummy)
-		: "0" (0), "r" (__s), "r" (__n), "i" (-EFAULT));
+		: "0" (0), "r" (__s), "r" (__n), "i" (-EFAULT)
+		: "t");
 	return res;
 }