diff options
| author | James Morris <james.l.morris@oracle.com> | 2018-01-09 11:40:59 +1100 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2018-01-09 11:40:59 +1100 |
| commit | ebceb1c87c0c482d47cb92dc3cc51d28f7387716 (patch) | |
| tree | 3fa626d8a7fddc9eba60dcd8c77fbf8a8ab656cd /security/integrity/ima/ima_init.c | |
| parent | d21bd6898336a7892914d308d5e0868f0b863571 (diff) | |
| parent | 68021bf4734d15c9a9ed1c1072b9ebcfda3e39cc (diff) | |
Merge tag 'tpmdd-next-20180108' of git://git.infradead.org/users/jjs/linux-tpmdd into next-tpm
tpmdd updates for Linux 4.16
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 2967d497a665..29b72cd2502e 100644 --- a/security/integrity/ima/ima_init.c +++ b/security/integrity/ima/ima_init.c @@ -110,7 +110,7 @@ int __init ima_init(void) int rc; ima_used_chip = 0; - rc = tpm_pcr_read(TPM_ANY_NUM, 0, pcr_i); + rc = tpm_pcr_read(NULL, 0, pcr_i); if (rc == 0) ima_used_chip = 1; |