[SSI] openssi/kernel/arch/x86_64/lib copy_user.S, 1.2, 1.3 usercopy.c, 1.2, 1.3

Update of /cvsroot/ssic-linux/openssi/kernel/arch/x86_64/lib
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv29261/arch/x86_64/lib

Modified Files:
      Tag: OPENSSI-DEBIAN
	copy_user.S usercopy.c 
Log Message:
Patch VANILLA x86_64 files for OpenSSI

Index: usercopy.c
===================================================================
RCS file: /cvsroot/ssic-linux/openssi/kernel/arch/x86_64/lib/usercopy.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- usercopy.c	15 Feb 2010 16:48:43 -0000	1.2
+++ usercopy.c	15 Feb 2010 16:51:39 -0000	1.3
@@ -41,7 +41,7 @@
 } while (0)
 
 long
-__strncpy_from_user(char *dst, const char __user *src, long count)
+__strncpy_from_user_lcl(char *dst, const char __user *src, long count)
 {
 	long res;
 	__do_strncpy_from_user(dst, src, count, res);
@@ -49,7 +49,7 @@
 }
 
 long
-strncpy_from_user(char *dst, const char __user *src, long count)
+strncpy_from_user_lcl(char *dst, const char __user *src, long count)
 {
 	long res = -EFAULT;
 	if (access_ok(VERIFY_READ, src, 1))
@@ -61,7 +61,7 @@
  * Zero Userspace
  */
 
-unsigned long __clear_user(void __user *addr, unsigned long size)
+unsigned long __clear_user_lcl(void __user *addr, unsigned long size)
 {
 	long __d0;
 	might_sleep();
@@ -96,10 +96,10 @@
 }
 
 
-unsigned long clear_user(void __user *to, unsigned long n)
+unsigned long clear_user_lcl(void __user *to, unsigned long n)
 {
 	if (access_ok(VERIFY_WRITE, to, n))
-		return __clear_user(to, n);
+		return __clear_user_lcl(to, n);
 	return n;
 }
 
@@ -109,7 +109,7 @@
  * Return 0 on exception, a value greater than N if too long
  */
 
-long strnlen_user(const char __user *s, long n)
+long strnlen_user_lcl(const char __user *s, long n)
 {
 	long res = 0;
 	char c;
@@ -120,7 +120,7 @@
 	while (1) {
 		if (res>n)
 			return n+1;
-		if (__get_user(c, s))
+		if (__get_user_lcl(c, s))
 			return 0;
 		if (!c)
 			return res+1;
@@ -129,13 +129,13 @@
 	}
 }
 
-long strlen_user(const char __user *s)
+long strlen_user_lcl(const char __user *s)
 {
 	long res = 0;
 	char c;
 
 	for (;;) {
-		if (get_user(c, s))
+		if (get_user_lcl(c, s))
 			return 0;
 		if (!c)
 			return res+1;

Index: copy_user.S
===================================================================
RCS file: /cvsroot/ssic-linux/openssi/kernel/arch/x86_64/lib/copy_user.S,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- copy_user.S	15 Feb 2010 16:48:43 -0000	1.2
+++ copy_user.S	15 Feb 2010 16:51:39 -0000	1.3
@@ -11,6 +11,11 @@
 	#include <asm/thread_info.h>
 	#include <asm/cpufeature.h>
 
+#ifdef CONFIG_SSI
+#define copy_to_user	copy_to_user_lcl
+#define copy_from_user	copy_from_user_lcl
+#endif
+
 /* Standard copy_to_user with segment limit checking */		
 	.globl copy_to_user
 	.p2align 4	


------------------------------------------------------------------------------
SOLARIS 10 is the OS for Data Centers - provides features such as DTrace,
Predictive Self Healing and Award Winning ZFS. Get Solaris 10 NOW
http://p.sf.net/sfu/solaris-dev2dev