aboutsummaryrefslogtreecommitdiffstats
path: root/security/integrity
diff options
context:
space:
mode:
authorH Hartley Sweeten <hartleys@visionengravers.com>2010-03-09 18:59:59 -0500
committerJames Morris <jmorris@namei.org>2010-03-09 23:59:54 -0500
commita19c5bbefb37ebe22fb42bd3861a8d3b2a2652a1 (patch)
tree4850853aca5c1ac564af02cd3240748579f32ba8 /security/integrity
parent512ea3bc30c0e052a961e1abce8e783f3e28c92a (diff)
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.c6
-rw-r--r--security/integrity/ima/ima_main.c2
2 files changed, 4 insertions, 4 deletions
diff --git a/security/integrity/ima/ima_iint.c b/security/integrity/ima/ima_iint.c
index 2d4d05d92fd..6cc22430cb4 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)
79 iint->version = 0; 79 iint->version = 0;
80 iint->flags = 0UL; 80 iint->flags = 0UL;
81 if (iint->readcount != 0) { 81 if (iint->readcount != 0) {
82 printk(KERN_INFO "%s: readcount: %ld\n", __FUNCTION__, 82 printk(KERN_INFO "%s: readcount: %ld\n", __func__,
83 iint->readcount); 83 iint->readcount);
84 iint->readcount = 0; 84 iint->readcount = 0;
85 } 85 }
86 if (iint->writecount != 0) { 86 if (iint->writecount != 0) {
87 printk(KERN_INFO "%s: writecount: %ld\n", __FUNCTION__, 87 printk(KERN_INFO "%s: writecount: %ld\n", __func__,
88 iint->writecount); 88 iint->writecount);
89 iint->writecount = 0; 89 iint->writecount = 0;
90 } 90 }
91 if (iint->opencount != 0) { 91 if (iint->opencount != 0) {
92 printk(KERN_INFO "%s: opencount: %ld\n", __FUNCTION__, 92 printk(KERN_INFO "%s: opencount: %ld\n", __func__,
93 iint->opencount); 93 iint->opencount);
94 iint->opencount = 0; 94 iint->opencount = 0;
95 } 95 }
diff --git a/security/integrity/ima/ima_main.c b/security/integrity/ima/ima_main.c
index 294b005d652..983037fb9a9 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,
194 (iint->writecount < 0)) && 194 (iint->writecount < 0)) &&
195 !ima_limit_imbalance(file)) { 195 !ima_limit_imbalance(file)) {
196 printk(KERN_INFO "%s: open/free imbalance (r:%ld w:%ld o:%ld)\n", 196 printk(KERN_INFO "%s: open/free imbalance (r:%ld w:%ld o:%ld)\n",
197 __FUNCTION__, iint->readcount, iint->writecount, 197 __func__, iint->readcount, iint->writecount,
198 iint->opencount); 198 iint->opencount);
199 dump_stack(); 199 dump_stack();
200 } 200 }