diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2010-07-13 02:10:36 +0200 |
|---|---|---|
| committer | Eric W. Biederman <ebiederm@xmission.com> | 2012-11-19 14:59:15 +0100 |
| commit | 1c4042c29bd2e85aac4110552ca8ade763762e84 (patch) | |
| tree | 90b34aeae51c9afa088eac37be4e8a14a038e6be /init/main.c | |
| parent | pidns: Add setns support (diff) | |
| download | linux-1c4042c29bd2e85aac4110552ca8ade763762e84.tar.xz linux-1c4042c29bd2e85aac4110552ca8ade763762e84.zip | |
pidns: Consolidate initialzation of special init task state
Instead of setting child_reaper and SIGNAL_UNKILLABLE one way
for the system init process, and another way for pid namespace
init processes test pid->nr == 1 and use the same code for both.
For the global init this results in SIGNAL_UNKILLABLE being set
much earlier in the initialization process.
This is a small cleanup and it paves the way for allowing unshare and
enter of the pid namespace as that path like our global init also will
not set CLONE_NEWPID.
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Diffstat (limited to 'init/main.c')
| -rw-r--r-- | init/main.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/init/main.c b/init/main.c index 9cf77ab138a6..317750a18f74 100644 --- a/init/main.c +++ b/init/main.c @@ -810,7 +810,6 @@ static int __ref kernel_init(void *unused) system_state = SYSTEM_RUNNING; numa_default_policy(); - current->signal->flags |= SIGNAL_UNKILLABLE; flush_delayed_fput(); if (ramdisk_execute_command) { |