lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

security/ima: replace gcc specific __FUNCTION__ with __func__

Browse Source 
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>
This commit is contained in:
H Hartley Sweeten
2010-03-09 17:59:59 -06:00
committed by James Morris
parent 512ea3bc30
commit a19c5bbefb
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
security/integrity/ima/ima_iint.c
View File

@@ -79,17 +79,17 @@ void iint_free(struct kref *kref)
iint->version = 0; iint->version = 0;
iint->flags = 0UL; iint->flags = 0UL;
if (iint->readcount != 0) { if (iint->readcount != 0) {
printk(KERN_INFO "%s: readcount: %ld\n", __FUNCTION__, printk(KERN_INFO "%s: readcount: %ld\n", __func__,
iint->readcount); iint->readcount);
iint->readcount = 0; iint->readcount = 0;
} }
if (iint->writecount != 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);
iint->writecount = 0; iint->writecount = 0;
} }
if (iint->opencount != 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);
iint->opencount = 0; iint->opencount = 0;
} }

2
security/integrity/ima/ima_main.c
View File

@@ -194,7 +194,7 @@ static void ima_dec_counts(struct ima_iint_cache *iint, struct inode *inode,
(iint->writecount < 0)) && (iint->writecount < 0)) &&
!ima_limit_imbalance(file)) { !ima_limit_imbalance(file)) {
printk(KERN_INFO "%s: open/free imbalance (r:%ld w:%ld o:%ld)\n", 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); iint->opencount);
dump_stack(); dump_stack();
} }