From e9614a2da55da0f183e98dc001fee924df3acda8 Mon Sep 17 00:00:00 2001 From: Pavel Emelyanov Date: Thu, 18 Oct 2007 23:40:04 -0700 Subject: [PATCH] --- yaml --- r: 71446 b: refs/heads/master c: faacbfd3a6808bf87d8f353b42eceeaba2c78a47 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/linux/pid_namespace.h | 2 ++ trunk/kernel/pid.c | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 4741fb1d0679..300b1941be07 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4c3f2ead5a3dff9069a45560ba4d007c8ae2e2ee +refs/heads/master: faacbfd3a6808bf87d8f353b42eceeaba2c78a47 diff --git a/trunk/include/linux/pid_namespace.h b/trunk/include/linux/pid_namespace.h index aea13ec31aba..14376ebf4bac 100644 --- a/trunk/include/linux/pid_namespace.h +++ b/trunk/include/linux/pid_namespace.h @@ -21,6 +21,8 @@ struct pid_namespace { int last_pid; struct task_struct *child_reaper; struct kmem_cache *pid_cachep; + int level; + struct pid_namespace *parent; }; extern struct pid_namespace init_pid_ns; diff --git a/trunk/kernel/pid.c b/trunk/kernel/pid.c index bb0785109d39..c7346fb801fc 100644 --- a/trunk/kernel/pid.c +++ b/trunk/kernel/pid.c @@ -67,7 +67,8 @@ struct pid_namespace init_pid_ns = { [ 0 ... PIDMAP_ENTRIES-1] = { ATOMIC_INIT(BITS_PER_PAGE), NULL } }, .last_pid = 0, - .child_reaper = &init_task + .level = 0, + .child_reaper = &init_task, }; int is_global_init(struct task_struct *tsk)