Merge branch 'slab/next' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg...

[~andy/linux] / fs / exec.c

diff --git a/fs/exec.c b/fs/exec.c
index da27b91ff1e8cbe87d0fe42aa5d39513e6a9deeb..e95aeeddd25c4038ad1656621bd9af56b7a0868e 100644 (file)
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -1020,7 +1020,7 @@ static void flush_old_files(struct files_struct * files)
                unsigned long set, i;
 
                j++;
-               i = j * __NFDBITS;
+               i = j * BITS_PER_LONG;
                fdt = files_fdtable(files);
                if (i >= fdt->max_fds)
                        break;