diff options
| author | Steve French <sfrench@us.ibm.com> | 2008-05-06 13:55:32 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-05-06 13:55:32 -0400 |
| commit | a815752ac0ffdb910e92958d41d28f4fb28e5296 (patch) | |
| tree | a3aa16a282354da0debe8e3a3a7ed8aac6e54001 /include/linux/pid_namespace.h | |
| parent | 5ade9deaaa3e1f7291467d97b238648e43eae15e (diff) | |
| parent | a15306365a16380f3bafee9e181ba01231d4acd7 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/linux/pid_namespace.h')
| -rw-r--r-- | include/linux/pid_namespace.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/pid_namespace.h b/include/linux/pid_namespace.h index fcd61fa2c833..caff5283d15c 100644 --- a/include/linux/pid_namespace.h +++ b/include/linux/pid_namespace.h | |||
| @@ -20,7 +20,7 @@ struct pid_namespace { | |||
| 20 | int last_pid; | 20 | int last_pid; |
| 21 | struct task_struct *child_reaper; | 21 | struct task_struct *child_reaper; |
| 22 | struct kmem_cache *pid_cachep; | 22 | struct kmem_cache *pid_cachep; |
| 23 | int level; | 23 | unsigned int level; |
| 24 | struct pid_namespace *parent; | 24 | struct pid_namespace *parent; |
| 25 | #ifdef CONFIG_PROC_FS | 25 | #ifdef CONFIG_PROC_FS |
| 26 | struct vfsmount *proc_mnt; | 26 | struct vfsmount *proc_mnt; |