diff options
| author | H Hartley Sweeten <hartleys@visionengravers.com> | 2010-03-10 00:59:59 +0100 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2010-03-10 05:59:54 +0100 |
| commit | a19c5bbefb37ebe22fb42bd3861a8d3b2a2652a1 (patch) | |
| tree | 4850853aca5c1ac564af02cd3240748579f32ba8 /security/integrity | |
| parent | Security: key: keyring: fix some code style issues (diff) | |
| download | linux-a19c5bbefb37ebe22fb42bd3861a8d3b2a2652a1.tar.xz linux-a19c5bbefb37ebe22fb42bd3861a8d3b2a2652a1.zip | |
security/ima: replace gcc specific __FUNCTION__ with __func__
As noted by checkpatch.pl, __func__ should be used instead of gcc
specific __FUNCTION__.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'security/integrity')
| -rw-r--r-- | security/integrity/ima/ima_iint.c | 6 | ||||
| -rw-r--r-- | security/integrity/ima/ima_main.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/security/integrity/ima/ima_iint.c b/security/integrity/ima/ima_iint.c index 2d4d05d92fda..6cc22430cb44 100644 --- a/security/integrity/ima/ima_iint.c +++ b/security/integrity/ima/ima_iint.c @@ -79,17 +79,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; } diff --git a/security/integrity/ima/ima_main.c b/security/integrity/ima/ima_main.c index 294b005d6520..983037fb9a9d 100644 --- a/security/integrity/ima/ima_main.c +++ b/security/integrity/ima/ima_main.c @@ -194,7 +194,7 @@ static void ima_dec_counts(struct ima_iint_cache *iint, struct inode *inode, (iint->writecount < 0)) && !ima_limit_imbalance(file)) { printk(KERN_INFO "%s: open/free imbalance (r:%ld w:%ld o:%ld)\n", - __FUNCTION__, iint->readcount, iint->writecount, + __func__, iint->readcount, iint->writecount, iint->opencount); dump_stack(); } |