Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.26

[linux-2.6-omap-h63xx.git] / security / security.c

diff --git a/security/security.c b/security/security.c
index c9ff7d18c2f4b32c89dabaa34ae7654cb0573c7f..54affd0ce6adea0b203f49d5780f00f170865288 100644 (file)
--- a/security/security.c
+++ b/security/security.c
@@ -57,7 +57,7 @@ int __init security_init(void)
 
        if (verify(&dummy_security_ops)) {
                printk(KERN_ERR "%s could not verify "
-                      "dummy_security_ops structure.\n", __FUNCTION__);
+                      "dummy_security_ops structure.\n", __func__);
                return -EIO;
        }
 
@@ -82,7 +82,7 @@ int register_security(struct security_operations *ops)
 {
        if (verify(ops)) {
                printk(KERN_DEBUG "%s could not verify "
-                      "security_operations structure.\n", __FUNCTION__);
+                      "security_operations structure.\n", __func__);
                return -EINVAL;
        }
 
@@ -110,13 +110,13 @@ int mod_reg_security(const char *name, struct security_operations *ops)
 {
        if (verify(ops)) {
                printk(KERN_INFO "%s could not verify "
-                      "security operations.\n", __FUNCTION__);
+                      "security operations.\n", __func__);
                return -EINVAL;
        }
 
        if (ops == security_ops) {
                printk(KERN_INFO "%s security operations "
-                      "already registered.\n", __FUNCTION__);
+                      "already registered.\n", __func__);
                return -EINVAL;
        }