Merge master.kernel.org:/home/rmk/linux-2.6-arm

[linux-2.6] / security / selinux / exports.c

diff --git a/security/selinux/exports.c b/security/selinux/exports.c
index ee0fb47f81ae0399da35ce8cb7ebf0a1ec5e3c7b..b6f96943be1fb456d5a998952abdd54d0ca3587b 100644 (file)
--- a/security/selinux/exports.c
+++ b/security/selinux/exports.c
@@ -21,10 +21,10 @@
 #include "security.h"
 #include "objsec.h"
 
-int selinux_ctxid_to_string(u32 ctxid, char **ctx, u32 *ctxlen)
+int selinux_sid_to_string(u32 sid, char **ctx, u32 *ctxlen)
 {
        if (selinux_enabled)
-               return security_sid_to_context(ctxid, ctx, ctxlen);
+               return security_sid_to_context(sid, ctx, ctxlen);
        else {
                *ctx = NULL;
                *ctxlen = 0;