8 files changed, 26 insertions, 26 deletions

diff --git a/security/commoncap.c b/security/commoncap.c
index 06d5c9469ba3..852905789caf 100644
--- a/security/commoncap.c
+++ b/security/commoncap.c
@@ -267,7 +267,7 @@ static int get_file_caps(struct linux_binprm *bprm)
         rc = cap_from_disk(&vcaps, bprm, rc);
         if (rc)
                 printk(KERN_NOTICE "%s: cap_from_disk returned %d for %s\n",
-                        __FUNCTION__, rc, bprm->filename);
+                        __func__, rc, bprm->filename);
 
 out:
         dput(dentry);
@@ -302,7 +302,7 @@ int cap_bprm_set_security (struct linux_binprm *bprm)
         ret = get_file_caps(bprm);
         if (ret)
                 printk(KERN_NOTICE "%s: get_file_caps returned %d for %s\n",
-                        __FUNCTION__, ret, bprm->filename);
+                        __func__, ret, bprm->filename);
 
         /*  To support inheritance of root-permissions and suid-root
          *  executables under compatibility mode, we raise all three
diff --git a/security/keys/internal.h b/security/keys/internal.h
index d36d69393356..7d894ef70370 100644
--- a/security/keys/internal.h
+++ b/security/keys/internal.h
@@ -22,16 +22,16 @@ void no_printk(const char *fmt, ...)
 
 #ifdef __KDEBUG
 #define kenter(FMT, ...) \
-        printk(KERN_DEBUG "==> %s("FMT")\n", __FUNCTION__, ##__VA_ARGS__)
+        printk(KERN_DEBUG "==> %s("FMT")\n", __func__, ##__VA_ARGS__)
 #define kleave(FMT, ...) \
-        printk(KERN_DEBUG "<== %s()"FMT"\n", __FUNCTION__, ##__VA_ARGS__)
+        printk(KERN_DEBUG "<== %s()"FMT"\n", __func__, ##__VA_ARGS__)
 #define kdebug(FMT, ...) \
         printk(KERN_DEBUG "xxx" FMT"yyy\n", ##__VA_ARGS__)
 #else
 #define kenter(FMT, ...) \
-        no_printk(KERN_DEBUG "==> %s("FMT")\n", __FUNCTION__, ##__VA_ARGS__)
+        no_printk(KERN_DEBUG "==> %s("FMT")\n", __func__, ##__VA_ARGS__)
 #define kleave(FMT, ...) \
-        no_printk(KERN_DEBUG "<== %s()"FMT"\n", __FUNCTION__, ##__VA_ARGS__)
+        no_printk(KERN_DEBUG "<== %s()"FMT"\n", __func__, ##__VA_ARGS__)
 #define kdebug(FMT, ...) \
         no_printk(KERN_DEBUG FMT"\n", ##__VA_ARGS__)
 #endif
diff --git a/security/root_plug.c b/security/root_plug.c
index 870f13095bb6..6112d1404c81 100644
--- a/security/root_plug.c
+++ b/security/root_plug.c
@@ -49,7 +49,7 @@ module_param(debug, bool, 0600);
         do {                                                    \
                 if (debug)                                      \
                         printk(KERN_DEBUG "%s: %s: " fmt ,      \
-                                MY_NAME , __FUNCTION__ ,        \
+                                MY_NAME , __func__ ,    \
                                 ## arg);                        \
         } while (0)
 
diff --git a/security/security.c b/security/security.c
index b1387a6b416d..9beecac933b4 100644
--- 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;
         }
 
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;
diff --git a/security/selinux/netlink.c b/security/selinux/netlink.c
index b59871d74dad..6214a7a73149 100644
--- a/security/selinux/netlink.c
+++ b/security/selinux/netlink.c
@@ -89,7 +89,7 @@ out:
 nlmsg_failure:
         kfree_skb(skb);
 oom:
-        printk(KERN_ERR "SELinux:  OOM in %s\n", __FUNCTION__);
+        printk(KERN_ERR "SELinux:  OOM in %s\n", __func__);
         goto out;
 }
 
diff --git a/security/selinux/selinuxfs.c b/security/selinux/selinuxfs.c
index 1d996bb953b8..26fabad09769 100644
--- a/security/selinux/selinuxfs.c
+++ b/security/selinux/selinuxfs.c
@@ -392,7 +392,7 @@ static ssize_t sel_write_context(struct file * file, char *buf, size_t size)
 
         if (len > SIMPLE_TRANSACTION_LIMIT) {
                 printk(KERN_ERR "%s:  context size (%u) exceeds payload "
-                       "max\n", __FUNCTION__, len);
+                       "max\n", __func__, len);
                 length = -ERANGE;
                 goto out;
         }
@@ -645,7 +645,7 @@ static ssize_t sel_write_create(struct file * file, char *buf, size_t size)
 
         if (len > SIMPLE_TRANSACTION_LIMIT) {
                 printk(KERN_ERR "%s:  context size (%u) exceeds payload "
-                       "max\n", __FUNCTION__, len);
+                       "max\n", __func__, len);
                 length = -ERANGE;
                 goto out3;
         }
@@ -822,7 +822,7 @@ static ssize_t sel_write_member(struct file * file, char *buf, size_t size)
 
         if (len > SIMPLE_TRANSACTION_LIMIT) {
                 printk(KERN_ERR "%s:  context size (%u) exceeds payload "
-                       "max\n", __FUNCTION__, len);
+                       "max\n", __func__, len);
                 length = -ERANGE;
                 goto out3;
         }
@@ -1761,7 +1761,7 @@ static int sel_fill_super(struct super_block * sb, void * data, int silent)
 out:
         return ret;
 err:
-        printk(KERN_ERR "%s:  failed while creating inodes\n", __FUNCTION__);
+        printk(KERN_ERR "%s:  failed while creating inodes\n", __func__);
         goto out;
 }
 
diff --git a/security/selinux/ss/services.c b/security/selinux/ss/services.c
index 4a14348de876..face5795c760 100644
--- a/security/selinux/ss/services.c
+++ b/security/selinux/ss/services.c
@@ -413,7 +413,7 @@ static int context_struct_compute_av(struct context *scontext,
         return 0;
 
 inval_class:
-        printk(KERN_ERR "%s:  unrecognized class %d\n", __FUNCTION__, tclass);
+        printk(KERN_ERR "%s:  unrecognized class %d\n", __func__, tclass);
         return -EINVAL;
 }
 
@@ -2206,7 +2206,7 @@ int security_get_permissions(char *class, char ***perms, int *nperms)
         match = hashtab_search(policydb.p_classes.table, class);
         if (!match) {
                 printk(KERN_ERR "%s:  unrecognized class %s\n",
-                        __FUNCTION__, class);
+                        __func__, class);
                 rc = -EINVAL;
                 goto out;
         }