diff options
| author | James Morris <jmorris@namei.org> | 2010-05-18 02:57:00 +0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2010-05-18 02:57:00 +0400 |
| commit | 539c99fd7fc28f8db257c713c10fb4aceadf8887 (patch) | |
| tree | e603e48ac816cde56e4872e0f7bcdfe7bd33f3b3 /security/integrity/ima/ima_iint.c | |
| parent | ba2e1c5f25a99dec3873745031ad23ce3fd79bff (diff) | |
| parent | 4d09ec0f705cf88a12add029c058b53f288cfaa2 (diff) | |
| download | linux-539c99fd7fc28f8db257c713c10fb4aceadf8887.tar.xz | |
Merge branch 'next' into for-linus
Diffstat (limited to 'security/integrity/ima/ima_iint.c')
| -rw-r--r-- | security/integrity/ima/ima_iint.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/security/integrity/ima/ima_iint.c b/security/integrity/ima/ima_iint.c index 2c744d488014..2dc2d6594145 100644 --- a/security/integrity/ima/ima_iint.c +++ b/security/integrity/ima/ima_iint.c @@ -80,17 +80,17 @@ void iint_free(struct kref *kref) iint->version = 0; iint->flags = 0UL; if (iint->readcount != 0) { - printk(KERN_INFO "%s: readcount: %ld\n", __FUNCTION__, + printk(KERN_INFO "%s: readcount: %ld\n", __func__, iint->readcount); iint->readcount = 0; } if (iint->writecount != 0) { - printk(KERN_INFO "%s: writecount: %ld\n", __FUNCTION__, + printk(KERN_INFO "%s: writecount: %ld\n", __func__, iint->writecount); iint->writecount = 0; } if (iint->opencount != 0) { - printk(KERN_INFO "%s: opencount: %ld\n", __FUNCTION__, + printk(KERN_INFO "%s: opencount: %ld\n", __func__, iint->opencount); iint->opencount = 0; } |