diff options
author | Harvey Harrison <harvey.harrison@gmail.com> | 2008-03-05 18:03:59 -0500 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2008-04-18 06:26:07 -0400 |
commit | dd6f953adb5c4deb9cd7b6a5054e7d5eafe4ed71 (patch) | |
tree | 0ed459ca8da43b7e0486c8f0a840845a731920bf /security/security.c | |
parent | b0c636b99997c8594da6a46e166ce4fcf6956fda (diff) |
security: replace remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc-specific, use __func__
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Cc: James Morris <jmorris@namei.org>
Cc: Stephen Smalley <sds@tycho.nsa.gov>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'security/security.c')
-rw-r--r-- | security/security.c | 8 |
1 files changed, 4 insertions, 4 deletions
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) | |||
57 | 57 | ||
58 | if (verify(&dummy_security_ops)) { | 58 | if (verify(&dummy_security_ops)) { |
59 | printk(KERN_ERR "%s could not verify " | 59 | printk(KERN_ERR "%s could not verify " |
60 | "dummy_security_ops structure.\n", __FUNCTION__); | 60 | "dummy_security_ops structure.\n", __func__); |
61 | return -EIO; | 61 | return -EIO; |
62 | } | 62 | } |
63 | 63 | ||
@@ -82,7 +82,7 @@ int register_security(struct security_operations *ops) | |||
82 | { | 82 | { |
83 | if (verify(ops)) { | 83 | if (verify(ops)) { |
84 | printk(KERN_DEBUG "%s could not verify " | 84 | printk(KERN_DEBUG "%s could not verify " |
85 | "security_operations structure.\n", __FUNCTION__); | 85 | "security_operations structure.\n", __func__); |
86 | return -EINVAL; | 86 | return -EINVAL; |
87 | } | 87 | } |
88 | 88 | ||
@@ -110,13 +110,13 @@ int mod_reg_security(const char *name, struct security_operations *ops) | |||
110 | { | 110 | { |
111 | if (verify(ops)) { | 111 | if (verify(ops)) { |
112 | printk(KERN_INFO "%s could not verify " | 112 | printk(KERN_INFO "%s could not verify " |
113 | "security operations.\n", __FUNCTION__); | 113 | "security operations.\n", __func__); |
114 | return -EINVAL; | 114 | return -EINVAL; |
115 | } | 115 | } |
116 | 116 | ||
117 | if (ops == security_ops) { | 117 | if (ops == security_ops) { |
118 | printk(KERN_INFO "%s security operations " | 118 | printk(KERN_INFO "%s security operations " |
119 | "already registered.\n", __FUNCTION__); | 119 | "already registered.\n", __func__); |
120 | return -EINVAL; | 120 | return -EINVAL; |
121 | } | 121 | } |
122 | 122 | ||