Merge branch 'work.read_write' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[sfrench/cifs-2.6.git] / kernel / compat.c

diff --git a/kernel/compat.c b/kernel/compat.c
index 6f0a0e723a0622a8876f9bfc81bbe08346db2ffd..772e038d04d9a85ef6e78c2df8924ca5348fce78 100644 (file)
--- a/kernel/compat.c
+++ b/kernel/compat.c
@@ -200,29 +200,6 @@ int compat_put_timespec(const struct timespec *ts, void __user *uts)
 }
 EXPORT_SYMBOL_GPL(compat_put_timespec);
 
-int compat_convert_timespec(struct timespec __user **kts,
-                           const void __user *cts)
-{
-       struct timespec ts;
-       struct timespec __user *uts;
-
-       if (!cts || COMPAT_USE_64BIT_TIME) {
-               *kts = (struct timespec __user *)cts;
-               return 0;
-       }
-
-       uts = compat_alloc_user_space(sizeof(ts));
-       if (!uts)
-               return -EFAULT;
-       if (compat_get_timespec(&ts, cts))
-               return -EFAULT;
-       if (copy_to_user(uts, &ts, sizeof(ts)))
-               return -EFAULT;
-
-       *kts = uts;
-       return 0;
-}
-
 int get_compat_itimerval(struct itimerval *o, const struct compat_itimerval __user *i)
 {
        struct compat_itimerval v32;