Merge 'staging-next' to Linus's tree

[net-next-2.6.git] / fs / compat.c

diff --git a/fs/compat.c b/fs/compat.c
index b42f29a44edbf3d29ff965af36f9f9a540cbc3fa..52cfeb61da77c14ce7d3838db7517b5b6f88b213 100644 (file)
--- a/fs/compat.c
+++ b/fs/compat.c
@@ -1124,7 +1124,7 @@ static ssize_t compat_do_readv_writev(int type, struct file *file,
 {
        compat_ssize_t tot_len;
        struct iovec iovstack[UIO_FASTIOV];
-       struct iovec *iov;
+       struct iovec *iov = iovstack;
        ssize_t ret;
        io_fn_t fn;
        iov_fn_t fnv;
@@ -1934,7 +1934,7 @@ asmlinkage long compat_sys_ppoll(struct pollfd __user *ufds,
 }
 #endif /* HAVE_SET_RESTORE_SIGMASK */
 
-#if defined(CONFIG_NFSD) || defined(CONFIG_NFSD_MODULE)
+#if (defined(CONFIG_NFSD) || defined(CONFIG_NFSD_MODULE)) && !defined(CONFIG_NFSD_DEPRECATED)
 /* Stuff for NFS server syscalls... */
 struct compat_nfsctl_svc {
        u16                     svc32_port;