diff options
| author | James Morris <jmorris@namei.org> | 2009-09-10 18:04:49 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-09-10 18:04:49 -0400 |
| commit | a3c8b97396ef42edfb845788ba6f53b2a93ce980 (patch) | |
| tree | 530c5bdbc534618311dab3e0af245835af56db0f /security/smack/smack.h | |
| parent | 74fca6a42863ffacaf7ba6f1936a9f228950f657 (diff) | |
| parent | 9f0ab4a3f0fdb1ff404d150618ace2fa069bb2e1 (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'security/smack/smack.h')
| -rw-r--r-- | security/smack/smack.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/smack/smack.h b/security/smack/smack.h index 243bec175be0..c6e9acae72e4 100644 --- a/security/smack/smack.h +++ b/security/smack/smack.h | |||
| @@ -275,7 +275,7 @@ static inline void smk_ad_init(struct smk_audit_info *a, const char *func, | |||
| 275 | { | 275 | { |
| 276 | memset(a, 0, sizeof(*a)); | 276 | memset(a, 0, sizeof(*a)); |
| 277 | a->a.type = type; | 277 | a->a.type = type; |
| 278 | a->a.function = func; | 278 | a->a.smack_audit_data.function = func; |
| 279 | } | 279 | } |
| 280 | 280 | ||
| 281 | static inline void smk_ad_setfield_u_tsk(struct smk_audit_info *a, | 281 | static inline void smk_ad_setfield_u_tsk(struct smk_audit_info *a, |