diff options
| author |   James Morris <james.l.morris@oracle.com> | 2015-06-18 23:28:40 +1000 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2015-06-18 23:28:40 +1000 |
| commit | b3bddffd35a0b77eee89760eb94cafa18dc431f5 (patch) | |
| tree | 58c0f6c79c121dfbe91f2058210c79d7ee25acc2 /security/integrity/ima/ima.h | |
| parent | tpm, tpm_crb: fix le64_to_cpu conversions in crb_acpi_add() (diff) | |
| parent | ima: update builtin policies (diff) | |
| download | linux-dev-b3bddffd35a0b77eee89760eb94cafa18dc431f5.tar.xz linux-dev-b3bddffd35a0b77eee89760eb94cafa18dc431f5.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.h')
| -rw-r--r-- | security/integrity/ima/ima.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/integrity/ima/ima.h b/security/integrity/ima/ima.h index c996f7edff3a..e2a60c30df44 100644 --- a/security/integrity/ima/ima.h +++ b/security/integrity/ima/ima.h @@ -115,7 +115,7 @@ void ima_add_violation(struct file *file, const unsigned char *filename, const char *op, const char *cause); int ima_init_crypto(void); void ima_putc(struct seq_file *m, void *data, int datalen); -void ima_print_digest(struct seq_file *m, u8 *digest, int size); +void ima_print_digest(struct seq_file *m, u8 *digest, u32 size); struct ima_template_desc *ima_template_desc_current(void); int ima_init_template(void); |