diff options
| author | James Morris <jmorris@namei.org> | 2011-03-15 18:41:17 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-03-15 18:41:17 -0400 |
| commit | a002951c97ff8da49938c982a4c236bf2fafdc9f (patch) | |
| tree | d43e7885ea7376df0a47a0fc8ceca66dc5bfa357 /security/selinux/ss/mls.h | |
| parent | 521cb40b0c44418a4fd36dc633f575813d59a43d (diff) | |
| parent | c151694b2c48d956ac8c8c59c6927f89cc29ef70 (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'security/selinux/ss/mls.h')
| -rw-r--r-- | security/selinux/ss/mls.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/security/selinux/ss/mls.h b/security/selinux/ss/mls.h index cd9152632e54..037bf9d82d41 100644 --- a/security/selinux/ss/mls.h +++ b/security/selinux/ss/mls.h | |||
| @@ -49,7 +49,8 @@ int mls_compute_sid(struct context *scontext, | |||
| 49 | struct context *tcontext, | 49 | struct context *tcontext, |
| 50 | u16 tclass, | 50 | u16 tclass, |
| 51 | u32 specified, | 51 | u32 specified, |
| 52 | struct context *newcontext); | 52 | struct context *newcontext, |
| 53 | bool sock); | ||
| 53 | 54 | ||
| 54 | int mls_setup_user_range(struct context *fromcon, struct user_datum *user, | 55 | int mls_setup_user_range(struct context *fromcon, struct user_datum *user, |
| 55 | struct context *usercon); | 56 | struct context *usercon); |