Merge branch 'drm-etnaviv-fixes' of git://git.pengutronix.de/lst/linux into drm-fixes

[linux-2.6-block.git] / fs / compat.c

diff --git a/fs/compat.c b/fs/compat.c
index be6e48b0a46c269d55b4befcdedaf1750e1e233f..bd064a2c3550e41d510dae6ff6e1186af685af36 100644 (file)
--- a/fs/compat.c
+++ b/fs/compat.c
@@ -54,20 +54,6 @@
 #include <asm/ioctls.h>
 #include "internal.h"
 
-int compat_log = 1;
-
-int compat_printk(const char *fmt, ...)
-{
-       va_list ap;
-       int ret;
-       if (!compat_log)
-               return 0;
-       va_start(ap, fmt);
-       ret = vprintk(fmt, ap);
-       va_end(ap);
-       return ret;
-}
-
 /*
  * Not all architectures have sys_utime, so implement this in terms
  * of sys_utimes.
@@ -562,7 +548,7 @@ ssize_t compat_rw_copy_check_uvector(int type,
                goto out;
 
        ret = -EINVAL;
-       if (nr_segs > UIO_MAXIOV || nr_segs < 0)
+       if (nr_segs > UIO_MAXIOV)
                goto out;
        if (nr_segs > fast_segs) {
                ret = -ENOMEM;