diff options
| author | James Morris <jmorris@namei.org> | 2008-11-26 08:26:44 +0300 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2008-11-26 08:26:44 +0300 |
| commit | 3496f92beb9aa99ef21fccc154a36c7698e9c538 (patch) | |
| tree | 2492602c6316b654378c3b557e206923956e59f4 /include/linux/sched.h | |
| parent | 200036ca9b3f0b2250912142552ce56682190f95 (diff) | |
| parent | 6ded6ab9be4f6164aef1c527407c1b94f0929799 (diff) | |
| download | linux-3496f92beb9aa99ef21fccc154a36c7698e9c538.tar.xz | |
Merge branch 'serge-next' into next
Diffstat (limited to 'include/linux/sched.h')
| -rw-r--r-- | include/linux/sched.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h index 2036e9f26020..7f8015a3082e 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -638,6 +638,7 @@ struct user_struct { /* Hash table maintenance information */ struct hlist_node uidhash_node; uid_t uid; + struct user_namespace *user_ns; #ifdef CONFIG_USER_SCHED struct task_group *tg; |