linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / arch / x86_64 / lib / usercopy.c

diff --git a/arch/x86_64/lib/usercopy.c b/arch/x86_64/lib/usercopy.c
index 893d43f..9bc2c29 100644 (file)
--- a/arch/x86_64/lib/usercopy.c
+++ b/arch/x86_64/lib/usercopy.c
@@ -5,7 +5,6 @@
  * Copyright 1997 Linus Torvalds
  * Copyright 2002 Andi Kleen <ak@suse.de>
  */
-#include <linux/module.h>
 #include <asm/uaccess.h>
 
 /*
@@ -48,17 +47,15 @@ __strncpy_from_user(char *dst, const char __user *src, long count)
        __do_strncpy_from_user(dst, src, count, res);
        return res;
 }
-EXPORT_SYMBOL(__strncpy_from_user);
 
 long
 strncpy_from_user(char *dst, const char __user *src, long count)
 {
        long res = -EFAULT;
        if (access_ok(VERIFY_READ, src, 1))
-               return __strncpy_from_user(dst, src, count);
+               __do_strncpy_from_user(dst, src, count, res);
        return res;
 }
-EXPORT_SYMBOL(strncpy_from_user);
 
 /*
  * Zero Userspace
@@ -97,7 +94,7 @@ unsigned long __clear_user(void __user *addr, unsigned long size)
                  [zero] "r" (0UL), [eight] "r" (8UL));
        return size;
 }
-EXPORT_SYMBOL(__clear_user);
+
 
 unsigned long clear_user(void __user *to, unsigned long n)
 {
@@ -105,7 +102,6 @@ unsigned long clear_user(void __user *to, unsigned long n)
                return __clear_user(to, n);
        return n;
 }
-EXPORT_SYMBOL(clear_user);
 
 /*
  * Return the size of a string (including the ending 0)
@@ -129,7 +125,6 @@ long __strnlen_user(const char __user *s, long n)
                s++;
        }
 }
-EXPORT_SYMBOL(__strnlen_user);
 
 long strnlen_user(const char __user *s, long n)
 {
@@ -137,7 +132,6 @@ long strnlen_user(const char __user *s, long n)
                return 0;
        return __strnlen_user(s, n);
 }
-EXPORT_SYMBOL(strnlen_user);
 
 long strlen_user(const char __user *s)
 {
@@ -153,7 +147,6 @@ long strlen_user(const char __user *s)
                s++;
        }
 }
-EXPORT_SYMBOL(strlen_user);
 
 unsigned long copy_in_user(void __user *to, const void __user *from, unsigned len)
 {
@@ -162,5 +155,3 @@ unsigned long copy_in_user(void __user *to, const void __user *from, unsigned le
        } 
        return len;             
 }
-EXPORT_SYMBOL(copy_in_user);
-