diff options
| author | James Morris <james.l.morris@oracle.com> | 2013-05-12 21:28:38 +1000 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2013-05-12 21:28:38 +1000 |
| commit | bd71164abc141ea696014e3e23c561b0d7f1b434 (patch) | |
| tree | 3b9c64698800566197bf4ecec604ba8bb1228bd3 /security/apparmor/include/procattr.h | |
| parent | f722406faae2d073cc1d01063d1123c35425939e (diff) | |
| parent | 2654bfbc2bd0e1e64f0b257c21da23f6cec32c6c (diff) | |
| download | op-kernel-dev-bd71164abc141ea696014e3e23c561b0d7f1b434.zip op-kernel-dev-bd71164abc141ea696014e3e23c561b0d7f1b434.tar.gz | |
Merge tag 'aa-3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor into ra-next
Diffstat (limited to 'security/apparmor/include/procattr.h')
| -rw-r--r-- | security/apparmor/include/procattr.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/security/apparmor/include/procattr.h b/security/apparmor/include/procattr.h index 544aa6b..6bd5f33 100644 --- a/security/apparmor/include/procattr.h +++ b/security/apparmor/include/procattr.h @@ -21,6 +21,5 @@ int aa_getprocattr(struct aa_profile *profile, char **string); int aa_setprocattr_changehat(char *args, size_t size, int test); int aa_setprocattr_changeprofile(char *fqname, bool onexec, int test); -int aa_setprocattr_permipc(char *fqname); #endif /* __AA_PROCATTR_H */ |
