]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
security/ima: replace gcc specific __FUNCTION__ with __func__
authorH Hartley Sweeten <hartleys@visionengravers.com>
Tue, 9 Mar 2010 23:59:59 +0000 (17:59 -0600)
committerJames Morris <jmorris@namei.org>
Wed, 10 Mar 2010 04:59:54 +0000 (15:59 +1100)
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>
security/integrity/ima/ima_iint.c
security/integrity/ima/ima_main.c

index 2d4d05d92fdacf01048ac9857541e8d17a3f0855..6cc22430cb4466ca0749f72a51f0016a4659709d 100644 (file)
@@ -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;
        }
index 294b005d65206edb7219989c033c4bbe34eb3cbd..983037fb9a9d4cca8914b9ad2de06cc9507589a7 100644 (file)
@@ -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();
        }