Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm...

[karo-tx-linux.git] / kernel / exit.c

diff --git a/kernel/exit.c b/kernel/exit.c
index d7fe58db452709444a42e622c964e604ddd42302..b4df21937216e1704670d89e8ef8fe8aa9aee810 100644 (file)
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@ -310,43 +310,6 @@ kill_orphaned_pgrp(struct task_struct *tsk, struct task_struct *parent)
        }
 }
 
-/**
- * reparent_to_kthreadd - Reparent the calling kernel thread to kthreadd
- *
- * If a kernel thread is launched as a result of a system call, or if
- * it ever exits, it should generally reparent itself to kthreadd so it
- * isn't in the way of other processes and is correctly cleaned up on exit.
- *
- * The various task state such as scheduling policy and priority may have
- * been inherited from a user process, so we reset them to sane values here.
- *
- * NOTE that reparent_to_kthreadd() gives the caller full capabilities.
- */
-static void reparent_to_kthreadd(void)
-{
-       write_lock_irq(&tasklist_lock);
-
-       ptrace_unlink(current);
-       /* Reparent to init */
-       current->real_parent = current->parent = kthreadd_task;
-       list_move_tail(&current->sibling, &current->real_parent->children);
-
-       /* Set the exit signal to SIGCHLD so we signal init on exit */
-       current->exit_signal = SIGCHLD;
-
-       if (task_nice(current) < 0)
-               set_user_nice(current, 0);
-       /* cpus_allowed? */
-       /* rt_priority? */
-       /* signals? */
-       memcpy(current->signal->rlim, init_task.signal->rlim,
-              sizeof(current->signal->rlim));
-
-       atomic_inc(&init_cred.usage);
-       commit_creds(&init_cred);
-       write_unlock_irq(&tasklist_lock);
-}
-
 void __set_special_pids(struct pid *pid)
 {
        struct task_struct *curr = current->group_leader;
@@ -358,13 +321,6 @@ void __set_special_pids(struct pid *pid)
                change_pid(curr, PIDTYPE_PGID, pid);
 }
 
-static void set_special_pids(struct pid *pid)
-{
-       write_lock_irq(&tasklist_lock);
-       __set_special_pids(pid);
-       write_unlock_irq(&tasklist_lock);
-}
-
 /*
  * Let kernel threads use this to say that they allow a certain signal.
  * Must not be used if kthread was cloned with CLONE_SIGHAND.
@@ -404,54 +360,6 @@ int disallow_signal(int sig)
 
 EXPORT_SYMBOL(disallow_signal);
 
-/*
- *     Put all the gunge required to become a kernel thread without
- *     attached user resources in one place where it belongs.
- */
-
-void daemonize(const char *name, ...)
-{
-       va_list args;
-       sigset_t blocked;
-
-       va_start(args, name);
-       vsnprintf(current->comm, sizeof(current->comm), name, args);
-       va_end(args);
-
-       /*
-        * If we were started as result of loading a module, close all of the
-        * user space pages.  We don't need them, and if we didn't close them
-        * they would be locked into memory.
-        */
-       exit_mm(current);
-       /*
-        * We don't want to get frozen, in case system-wide hibernation
-        * or suspend transition begins right now.
-        */
-       current->flags |= (PF_NOFREEZE | PF_KTHREAD);
-
-       if (current->nsproxy != &init_nsproxy) {
-               get_nsproxy(&init_nsproxy);
-               switch_task_namespaces(current, &init_nsproxy);
-       }
-       set_special_pids(&init_struct_pid);
-       proc_clear_tty(current);
-
-       /* Block and flush all signals */
-       sigfillset(&blocked);
-       sigprocmask(SIG_BLOCK, &blocked, NULL);
-       flush_signals(current);
-
-       /* Become as one with the init task */
-
-       daemonize_fs_struct();
-       daemonize_descriptors();
-
-       reparent_to_kthreadd();
-}
-
-EXPORT_SYMBOL(daemonize);
-
 #ifdef CONFIG_MM_OWNER
 /*
  * A task is exiting.   If it owned this mm, find a new owner for the mm.
@@ -1174,11 +1082,11 @@ static int wait_task_zombie(struct wait_opts *wo, struct task_struct *p)
                 * as other threads in the parent group can be right
                 * here reaping other children at the same time.
                 *
-                * We use thread_group_times() to get times for the thread
+                * We use thread_group_cputime_adjusted() to get times for the thread
                 * group, which consolidates times for all threads in the
                 * group including the group leader.
                 */
-               thread_group_times(p, &tgutime, &tgstime);
+               thread_group_cputime_adjusted(p, &tgutime, &tgstime);
                spin_lock_irq(&p->real_parent->sighand->siglock);
                psig = p->real_parent->signal;
                sig = p->signal;