Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel...

[firefly-linux-kernel-4.4.55.git] / kernel / exit.c

diff --git a/kernel/exit.c b/kernel/exit.c
index 20dfc7617c2e07f46dfa9fc551cc9bd51ffbe508..346616c0092cfe3993fbcfb9b7f36d0d02986fb2 100644 (file)
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@ -457,9 +457,7 @@ void daemonize(const char *name, ...)
        /* Become as one with the init task */
 
        daemonize_fs_struct();
-       exit_files(current);
-       current->files = init_task.files;
-       atomic_inc(&current->files->count);
+       daemonize_descriptors();
 
        reparent_to_kthreadd();
 }
@@ -953,6 +951,9 @@ void do_exit(long code)
        if (tsk->splice_pipe)
                __free_pipe_info(tsk->splice_pipe);
 
+       if (tsk->task_frag.page)
+               put_page(tsk->task_frag.page);
+
        validate_creds_for_do_exit(tsk);
 
        preempt_disable();