Merge git://git.infradead.org/embedded-2.6

[linux-2.6-omap-h63xx.git] / security / selinux / ss / mls.h

diff --git a/security/selinux/ss/mls.h b/security/selinux/ss/mls.h
index ab53663d9f5f96691915d568954712260e92f2ae..1276715aaa8bf3f0aac5973022f38e98388b0605 100644 (file)
--- a/security/selinux/ss/mls.h
+++ b/security/selinux/ss/mls.h
@@ -13,7 +13,7 @@
 /*
  * Updated: Hewlett-Packard <paul.moore@hp.com>
  *
- *      Added support to import/export the MLS label from NetLabel
+ *     Added support to import/export the MLS label from NetLabel
  *
  * (c) Copyright Hewlett-Packard Development Company, L.P., 2006
  */
@@ -30,8 +30,9 @@ int mls_context_isvalid(struct policydb *p, struct context *c);
 int mls_range_isvalid(struct policydb *p, struct mls_range *r);
 int mls_level_isvalid(struct policydb *p, struct mls_level *l);
 
-int mls_context_to_sid(char oldc,
-                      char **scontext,
+int mls_context_to_sid(struct policydb *p,
+                      char oldc,
+                      char **scontext,
                       struct context *context,
                       struct sidtab *s,
                       u32 def_sid);
@@ -49,7 +50,7 @@ int mls_compute_sid(struct context *scontext,
                    struct context *newcontext);
 
 int mls_setup_user_range(struct context *fromcon, struct user_datum *user,
-                         struct context *usercon);
+                        struct context *usercon);
 
 #ifdef CONFIG_NETLABEL
 void mls_export_netlbl_lvl(struct context *context,