Merge branch 'overlayfs-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszer...

[sfrench/cifs-2.6.git] / fs / select.c

diff --git a/fs/select.c b/fs/select.c
index bd4b2ccfd34680b1648570e7b20db235cb31a89c..d6c652a31e99d18d2d924af983c11504315af56f 100644 (file)
--- a/fs/select.c
+++ b/fs/select.c
@@ -633,10 +633,7 @@ int core_sys_select(int n, fd_set __user *inp, fd_set __user *outp,
                        goto out_nofds;
 
                alloc_size = 6 * size;
-               bits = kmalloc(alloc_size, GFP_KERNEL|__GFP_NOWARN);
-               if (!bits && alloc_size > PAGE_SIZE)
-                       bits = vmalloc(alloc_size);
-
+               bits = kvmalloc(alloc_size, GFP_KERNEL);
                if (!bits)
                        goto out_nofds;
        }