diff options
author | Mark Brown <broonie@linaro.org> | 2013-08-15 12:09:32 +0100 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-08-15 12:09:32 +0100 |
commit | c1a0dd11e183ccd2dbc42ab699a65a335e065936 (patch) | |
tree | 93df00912f65ff3c50ed674bfe8d4fcfbdc61f0f /include/linux/user_namespace.h | |
parent | f462c0c2ffbaff2345c215fc65874f50c98ad09c (diff) | |
parent | 519be4566e2e60293d55bcfec71490af8e61b9e7 (diff) | |
download | vexpress-lsk-c1a0dd11e183ccd2dbc42ab699a65a335e065936.tar.gz |
Merge tag 'v3.10.7' into linux-linaro-lsk
This is the 3.10.7 stable release
Diffstat (limited to 'include/linux/user_namespace.h')
-rw-r--r-- | include/linux/user_namespace.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/user_namespace.h b/include/linux/user_namespace.h index b6b215f13b4..14105c26a83 100644 --- a/include/linux/user_namespace.h +++ b/include/linux/user_namespace.h @@ -23,6 +23,7 @@ struct user_namespace { struct uid_gid_map projid_map; atomic_t count; struct user_namespace *parent; + int level; kuid_t owner; kgid_t group; unsigned int proc_inum; |