diff options
Diffstat (limited to 'kernel/fork.c')
| -rw-r--r-- | kernel/fork.c | 38 |
1 files changed, 1 insertions, 37 deletions
diff --git a/kernel/fork.c b/kernel/fork.c index b0ec34abc0bb..1beb6c303c41 100644 --- a/kernel/fork.c +++ b/kernel/fork.c | |||
| @@ -833,17 +833,6 @@ static void posix_cpu_timers_init_group(struct signal_struct *sig) | |||
| 833 | /* Thread group counters. */ | 833 | /* Thread group counters. */ |
| 834 | thread_group_cputime_init(sig); | 834 | thread_group_cputime_init(sig); |
| 835 | 835 | ||
| 836 | /* Expiration times and increments. */ | ||
| 837 | sig->it[CPUCLOCK_PROF].expires = cputime_zero; | ||
| 838 | sig->it[CPUCLOCK_PROF].incr = cputime_zero; | ||
| 839 | sig->it[CPUCLOCK_VIRT].expires = cputime_zero; | ||
| 840 | sig->it[CPUCLOCK_VIRT].incr = cputime_zero; | ||
| 841 | |||
| 842 | /* Cached expiration times. */ | ||
| 843 | sig->cputime_expires.prof_exp = cputime_zero; | ||
| 844 | sig->cputime_expires.virt_exp = cputime_zero; | ||
| 845 | sig->cputime_expires.sched_exp = 0; | ||
| 846 | |||
| 847 | cpu_limit = ACCESS_ONCE(sig->rlim[RLIMIT_CPU].rlim_cur); | 836 | cpu_limit = ACCESS_ONCE(sig->rlim[RLIMIT_CPU].rlim_cur); |
| 848 | if (cpu_limit != RLIM_INFINITY) { | 837 | if (cpu_limit != RLIM_INFINITY) { |
| 849 | sig->cputime_expires.prof_exp = secs_to_cputime(cpu_limit); | 838 | sig->cputime_expires.prof_exp = secs_to_cputime(cpu_limit); |
| @@ -863,7 +852,7 @@ static int copy_signal(unsigned long clone_flags, struct task_struct *tsk) | |||
| 863 | if (clone_flags & CLONE_THREAD) | 852 | if (clone_flags & CLONE_THREAD) |
| 864 | return 0; | 853 | return 0; |
| 865 | 854 | ||
| 866 | sig = kmem_cache_alloc(signal_cachep, GFP_KERNEL); | 855 | sig = kmem_cache_zalloc(signal_cachep, GFP_KERNEL); |
| 867 | tsk->signal = sig; | 856 | tsk->signal = sig; |
| 868 | if (!sig) | 857 | if (!sig) |
| 869 | return -ENOMEM; | 858 | return -ENOMEM; |
| @@ -871,46 +860,21 @@ static int copy_signal(unsigned long clone_flags, struct task_struct *tsk) | |||
| 871 | atomic_set(&sig->count, 1); | 860 | atomic_set(&sig->count, 1); |
| 872 | atomic_set(&sig->live, 1); | 861 | atomic_set(&sig->live, 1); |
| 873 | init_waitqueue_head(&sig->wait_chldexit); | 862 | init_waitqueue_head(&sig->wait_chldexit); |
| 874 | sig->flags = 0; | ||
| 875 | if (clone_flags & CLONE_NEWPID) | 863 | if (clone_flags & CLONE_NEWPID) |
| 876 | sig->flags |= SIGNAL_UNKILLABLE; | 864 | sig->flags |= SIGNAL_UNKILLABLE; |
| 877 | sig->group_exit_code = 0; | ||
| 878 | sig->group_exit_task = NULL; | ||
| 879 | sig->group_stop_count = 0; | ||
| 880 | sig->curr_target = tsk; | 865 | sig->curr_target = tsk; |
| 881 | init_sigpending(&sig->shared_pending); | 866 | init_sigpending(&sig->shared_pending); |
| 882 | INIT_LIST_HEAD(&sig->posix_timers); | 867 | INIT_LIST_HEAD(&sig->posix_timers); |
| 883 | 868 | ||
| 884 | hrtimer_init(&sig->real_timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL); | 869 | hrtimer_init(&sig->real_timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL); |
| 885 | sig->it_real_incr.tv64 = 0; | ||
| 886 | sig->real_timer.function = it_real_fn; | 870 | sig->real_timer.function = it_real_fn; |
| 887 | 871 | ||
| 888 | sig->leader = 0; /* session leadership doesn't inherit */ | ||
| 889 | sig->tty_old_pgrp = NULL; | ||
| 890 | sig->tty = NULL; | ||
| 891 | |||
| 892 | sig->utime = sig->stime = sig->cutime = sig->cstime = cputime_zero; | ||
| 893 | sig->gtime = cputime_zero; | ||
| 894 | sig->cgtime = cputime_zero; | ||
| 895 | #ifndef CONFIG_VIRT_CPU_ACCOUNTING | ||
| 896 | sig->prev_utime = sig->prev_stime = cputime_zero; | ||
| 897 | #endif | ||
| 898 | sig->nvcsw = sig->nivcsw = sig->cnvcsw = sig->cnivcsw = 0; | ||
| 899 | sig->min_flt = sig->maj_flt = sig->cmin_flt = sig->cmaj_flt = 0; | ||
| 900 | sig->inblock = sig->oublock = sig->cinblock = sig->coublock = 0; | ||
| 901 | sig->maxrss = sig->cmaxrss = 0; | ||
| 902 | task_io_accounting_init(&sig->ioac); | ||
| 903 | sig->sum_sched_runtime = 0; | ||
| 904 | taskstats_tgid_init(sig); | ||
| 905 | |||
| 906 | task_lock(current->group_leader); | 872 | task_lock(current->group_leader); |
| 907 | memcpy(sig->rlim, current->signal->rlim, sizeof sig->rlim); | 873 | memcpy(sig->rlim, current->signal->rlim, sizeof sig->rlim); |
| 908 | task_unlock(current->group_leader); | 874 | task_unlock(current->group_leader); |
| 909 | 875 | ||
| 910 | posix_cpu_timers_init_group(sig); | 876 | posix_cpu_timers_init_group(sig); |
| 911 | 877 | ||
| 912 | acct_init_pacct(&sig->pacct); | ||
| 913 | |||
| 914 | tty_audit_fork(sig); | 878 | tty_audit_fork(sig); |
| 915 | 879 | ||
| 916 | sig->oom_adj = current->signal->oom_adj; | 880 | sig->oom_adj = current->signal->oom_adj; |
