patch-2.3.23 linux/include/asm-arm/proc-armv/uaccess.h

• Lines: 40
• Date: Wed Oct 20 16:29:08 1999
• Orig file: v2.3.22/linux/include/asm-arm/proc-armv/uaccess.h
• Orig date: Mon Aug 2 10:19:52 1999

diff -u --recursive --new-file v2.3.22/linux/include/asm-arm/proc-armv/uaccess.h linux/include/asm-arm/proc-armv/uaccess.h
@@ -2,7 +2,7 @@
  * linux/include/asm-arm/proc-armv/uaccess.h
  */
 
-#include <asm/hardware.h>
+#include <asm/arch/memory.h>
 #include <asm/proc/domain.h>
 
 /*
@@ -11,11 +11,6 @@
 #define KERNEL_DS	0x00000000
 #define USER_DS		PAGE_OFFSET
 
-#define get_ds()	(KERNEL_DS)
-#define get_fs()	(current->addr_limit)
-
-#define segment_eq(a,b)	((a) == (b))
-
 extern __inline__ void set_fs (mm_segment_t fs)
 {
 	current->addr_limit = fs;
@@ -40,8 +35,6 @@
 		: "cc"); \
 	(flag == 0); })
 
-#define access_ok(type,addr,size) (__range_ok(addr,size) == 0)
-
 #define __put_user_asm_byte(x,addr,err)				\
 	__asm__ __volatile__(					\
 	"1:	strbt	%1,[%2],#0\n"				\
@@ -172,6 +165,6 @@
 #define __do_strncpy_from_user(dst,src,count,res)		\
 	(res) = __arch_strncpy_from_user(dst,src,count)
 
-extern unsigned long __arch_strlen_user(const char *s);
-#define __do_strlen_user(s,res)					\
-	(res) = __arch_strlen_user(s)
+extern unsigned long __arch_strnlen_user(const char *s, long n);
+#define __do_strnlen_user(s,n,res)					\
+	(res) = __arch_strnlen_user(s,n)