diff options
| author | James Morris <james.l.morris@oracle.com> | 2014-10-02 13:47:23 +0400 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2014-10-02 13:47:23 +0400 |
| commit | c867d07e3c861e75509650b8a359351d634db93a (patch) | |
| tree | f912043f48b9232db284ff67311eae8692918729 /security/integrity/ima/ima_api.c | |
| parent | 858f61c4298d858376ca7b9fc2e05677faabd2d5 (diff) | |
| parent | 1b68bdf9cded82d37e443a20c5ed47bbb084d5dc (diff) | |
| download | linux-c867d07e3c861e75509650b8a359351d634db93a.tar.xz | |
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity into next
Diffstat (limited to 'security/integrity/ima/ima_api.c')
| -rw-r--r-- | security/integrity/ima/ima_api.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/security/integrity/ima/ima_api.c b/security/integrity/ima/ima_api.c index 65c41a968cc1..86885979918c 100644 --- a/security/integrity/ima/ima_api.c +++ b/security/integrity/ima/ima_api.c @@ -179,11 +179,6 @@ int ima_get_action(struct inode *inode, int mask, int function) return ima_match_policy(inode, function, mask, flags); } -int ima_must_measure(struct inode *inode, int mask, int function) -{ - return ima_match_policy(inode, function, mask, IMA_MEASURE); -} - /* * ima_collect_measurement - collect file measurement * |