diff options
| author | James Morris <james.l.morris@oracle.com> | 2012-05-22 03:21:06 +0200 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2012-05-22 03:21:06 +0200 |
| commit | ff2bb047c4bce9742e94911eeb44b4d6ff4734ab (patch) | |
| tree | 9d9b1cfa3fc17f0cc13f34ca697306cb1f46b05f /security/apparmor/include/audit.h | |
| parent | apparmor: fix long path failure due to disconnected path (diff) | |
| parent | SELinux: remove unused common_audit_data in flush_unauthorized_files (diff) | |
| download | linux-ff2bb047c4bce9742e94911eeb44b4d6ff4734ab.tar.xz linux-ff2bb047c4bce9742e94911eeb44b4d6ff4734ab.zip | |
Merge branch 'master' of git://git.infradead.org/users/eparis/selinux into next
Per pull request, for 3.5.
Diffstat (limited to 'security/apparmor/include/audit.h')
| -rw-r--r-- | security/apparmor/include/audit.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/security/apparmor/include/audit.h b/security/apparmor/include/audit.h index 3868b1e5d5ba..4b7e18951aea 100644 --- a/security/apparmor/include/audit.h +++ b/security/apparmor/include/audit.h @@ -110,6 +110,7 @@ struct apparmor_audit_data { void *profile; const char *name; const char *info; + struct task_struct *tsk; union { void *target; struct { |