Merge branch 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm

[~andy/linux] / security / apparmor / domain.c

diff --git a/security/apparmor/domain.c b/security/apparmor/domain.c
index 08bbe6397a7f5c6ad11eb2600f3f0a28a18cb5eb..c825c6e0b636ee985283d3d4a077deaa24343808 100644 (file)
--- a/security/apparmor/domain.c
+++ b/security/apparmor/domain.c
@@ -62,7 +62,7 @@ static int may_change_ptraced_domain(struct task_struct *task,
                                     struct aa_profile *to_profile)
 {
        struct task_struct *tracer;
-       struct cred *cred = NULL;
+       const struct cred *cred = NULL;
        struct aa_profile *tracerp = NULL;
        int error = 0;