Merge branch 'x86/x32' into x86/cleanups

Merge reason: We are going to merge a dependent patch.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 4 insertions, 4 deletions

diff --git a/fs/exec.c b/fs/exec.c
index 92ce83a11e90..cfd5e3047bd8 100644
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -1026,10 +1026,10 @@ static void flush_old_files(struct files_struct * files)
                 fdt = files_fdtable(files);
                 if (i >= fdt->max_fds)
                         break;
-                set = fdt->close_on_exec->fds_bits[j];
+                set = fdt->close_on_exec[j];
                 if (!set)
                         continue;
-                fdt->close_on_exec->fds_bits[j] = 0;
+                fdt->close_on_exec[j] = 0;
                 spin_unlock(&files->file_lock);
                 for ( ; set ; i++,set >>= 1) {
                         if (set & 1) {
@@ -2078,8 +2078,8 @@ static int umh_pipe_setup(struct subprocess_info *info, struct cred *new)
         fd_install(0, rp);
         spin_lock(&cf->file_lock);
         fdt = files_fdtable(cf);
-        FD_SET(0, fdt->open_fds);
-        FD_CLR(0, fdt->close_on_exec);
+        __set_open_fd(0, fdt);
+        __clear_close_on_exec(0, fdt);
         spin_unlock(&cf->file_lock);
 
         /* and disallow core files too */