diff options
| author | James Morris <james.l.morris@oracle.com> | 2015-12-26 16:06:53 +1100 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2015-12-26 16:06:53 +1100 |
| commit | 3cb92fe48138d225b8d0ceedf148642f9103f841 (patch) | |
| tree | cbb877002d9d39777be13df3876e05f2542da234 /security/integrity/ima/ima_init.c | |
| parent | 5beb0c435bdde35a09376566b0e28f7df87c9f68 (diff) | |
| parent | 0112721df4edbdd07b800813300d76811572f080 (diff) | |
| download | linux-3cb92fe48138d225b8d0ceedf148642f9103f841.tar.gz linux-3cb92fe48138d225b8d0ceedf148642f9103f841.tar.bz2 linux-3cb92fe48138d225b8d0ceedf148642f9103f841.zip | |
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_init.c')
| -rw-r--r-- | security/integrity/ima/ima_init.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/integrity/ima/ima_init.c b/security/integrity/ima/ima_init.c index e600cadd231c..bd79f254d204 100644 --- a/security/integrity/ima/ima_init.c +++ b/security/integrity/ima/ima_init.c @@ -116,7 +116,7 @@ int __init ima_init(void) if (!ima_used_chip) pr_info("No TPM chip found, activating TPM-bypass!\n"); - rc = ima_init_keyring(INTEGRITY_KEYRING_IMA); + rc = integrity_init_keyring(INTEGRITY_KEYRING_IMA); if (rc) return rc; |