summaryrefslogtreecommitdiff
path: root/security/selinux/ss/mls.h
diff options
context:
space:
mode:
authorJames Morris <jmorris@namei.org>2010-03-01 01:36:31 +0300
committerJames Morris <jmorris@namei.org>2010-03-01 01:36:31 +0300
commitb4ccebdd37ff70d349321a198f416ba737a5e833 (patch)
tree275d717070346722c3aacd8355fb4f743216e03b /security/selinux/ss/mls.h
parent30ff056c42c665b9ea535d8515890857ae382540 (diff)
parentef57471a73b67a7b65fd8708fd55c77cb7c619af (diff)
downloadlinux-b4ccebdd37ff70d349321a198f416ba737a5e833.tar.xz
Merge branch 'next' into for-linus
Diffstat (limited to 'security/selinux/ss/mls.h')
-rw-r--r--security/selinux/ss/mls.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/security/selinux/ss/mls.h b/security/selinux/ss/mls.h
index 1276715aaa8b..cd9152632e54 100644
--- a/security/selinux/ss/mls.h
+++ b/security/selinux/ss/mls.h
@@ -39,6 +39,8 @@ int mls_context_to_sid(struct policydb *p,
int mls_from_string(char *str, struct context *context, gfp_t gfp_mask);
+int mls_range_set(struct context *context, struct mls_range *range);
+
int mls_convert_context(struct policydb *oldp,
struct policydb *newp,
struct context *context);