projects
/
linux-3.10.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
Merge branch 'master' of git://git.infradead.org/users/eparis/selinux into next
[linux-3.10.git]
/
security
/
apparmor
/
policy.c
diff --git
a/security/apparmor/policy.c
b/security/apparmor/policy.c
index
7f3f455
..
cf5fd22
100644
(file)
--- a/
security/apparmor/policy.c
+++ b/
security/apparmor/policy.c
@@
-969,7
+969,7
@@
static int audit_policy(int op, gfp_t gfp, const char *name, const char *info,
{
struct common_audit_data sa;
struct apparmor_audit_data aad = {0,};
- COMMON_AUDIT_DATA_INIT(&sa, NONE);
+ sa.type = LSM_AUDIT_DATA_NONE;
sa.aad = &aad;
aad.op = op;
aad.name = name;