Merge branch 'sa1100' into devel

1 files changed, 10 insertions, 3 deletions

diff --git a/security/selinux/include/security.h b/security/selinux/include/security.h
index ca835795a8b3..2553266ad793 100644
--- a/security/selinux/include/security.h
+++ b/security/selinux/include/security.h
@@ -97,11 +97,18 @@ struct av_decision {
 #define AVD_FLAGS_PERMISSIVE    0x0001
 
 int security_compute_av(u32 ssid, u32 tsid,
-        u16 tclass, u32 requested,
-        struct av_decision *avd);
+                        u16 tclass, u32 requested,
+                        struct av_decision *avd);
+
+int security_compute_av_user(u32 ssid, u32 tsid,
+                             u16 tclass, u32 requested,
+                             struct av_decision *avd);
 
 int security_transition_sid(u32 ssid, u32 tsid,
-        u16 tclass, u32 *out_sid);
+                            u16 tclass, u32 *out_sid);
+
+int security_transition_sid_user(u32 ssid, u32 tsid,
+                                 u16 tclass, u32 *out_sid);
 
 int security_member_sid(u32 ssid, u32 tsid,
         u16 tclass, u32 *out_sid);