1 files changed, 8 insertions, 8 deletions

diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index d569cde440e6..74bb74b4db08 100644
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -668,7 +668,7 @@ static int selinux_set_mnt_opts(struct super_block *sb,
         rc = security_fs_use(sb->s_type->name, &sbsec->behavior, &sbsec->sid);
         if (rc) {
                 printk(KERN_WARNING "%s: security_fs_use(%s) returned %d\n",
-                       __FUNCTION__, sb->s_type->name, rc);
+                       __func__, sb->s_type->name, rc);
                 goto out;
         }
 
@@ -1134,7 +1134,7 @@ static int inode_doinit_with_dentry(struct inode *inode, struct dentry *opt_dent
                 }
                 if (!dentry) {
                         printk(KERN_WARNING "%s:  no dentry for dev=%s "
-                               "ino=%ld\n", __FUNCTION__, inode->i_sb->s_id,
+                               "ino=%ld\n", __func__, inode->i_sb->s_id,
                                inode->i_ino);
                         goto out_unlock;
                 }
@@ -1172,7 +1172,7 @@ static int inode_doinit_with_dentry(struct inode *inode, struct dentry *opt_dent
                 if (rc < 0) {
                         if (rc != -ENODATA) {
                                 printk(KERN_WARNING "%s:  getxattr returned "
-                                       "%d for dev=%s ino=%ld\n", __FUNCTION__,
+                                       "%d for dev=%s ino=%ld\n", __func__,
                                        -rc, inode->i_sb->s_id, inode->i_ino);
                                 kfree(context);
                                 goto out_unlock;
@@ -1187,7 +1187,7 @@ static int inode_doinit_with_dentry(struct inode *inode, struct dentry *opt_dent
                         if (rc) {
                                 printk(KERN_WARNING "%s:  context_to_sid(%s) "
                                        "returned %d for dev=%s ino=%ld\n",
-                                       __FUNCTION__, context, -rc,
+                                       __func__, context, -rc,
                                        inode->i_sb->s_id, inode->i_ino);
                                 kfree(context);
                                 /* Leave with the unlabeled SID */
@@ -2437,7 +2437,7 @@ static int selinux_inode_init_security(struct inode *inode, struct inode *dir,
                         printk(KERN_WARNING "%s:  "
                                "security_transition_sid failed, rc=%d (dev=%s "
                                "ino=%ld)\n",
-                               __FUNCTION__,
+                               __func__,
                                -rc, inode->i_sb->s_id, inode->i_ino);
                         return rc;
                 }
@@ -2671,7 +2671,7 @@ static void selinux_inode_post_setxattr(struct dentry *dentry, char *name,
         rc = security_context_to_sid(value, size, &newsid);
         if (rc) {
                 printk(KERN_WARNING "%s:  unable to obtain SID for context "
-                       "%s, rc=%d\n", __FUNCTION__, (char*)value, -rc);
+                       "%s, rc=%d\n", __func__, (char*)value, -rc);
                 return;
         }
 
@@ -5017,14 +5017,14 @@ static int selinux_register_security (const char *name, struct security_operatio
 {
         if (secondary_ops != original_ops) {
                 printk(KERN_ERR "%s:  There is already a secondary security "
-                       "module registered.\n", __FUNCTION__);
+                       "module registered.\n", __func__);
                 return -EINVAL;
         }
 
         secondary_ops = ops;
 
         printk(KERN_INFO "%s:  Registering secondary module %s\n",
-               __FUNCTION__,
+               __func__,
                name);
 
         return 0;