Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild

1 files changed, 2 insertions, 4 deletions

diff --git a/security/capability.c b/security/capability.c
index ec18d6075625..f9b35cc0b248 100644
--- a/security/capability.c
+++ b/security/capability.c
@@ -49,8 +49,6 @@ static struct security_operations capability_ops = {
         .vm_enough_memory =             cap_vm_enough_memory,
 };
 
-#define MY_NAME __stringify(KBUILD_MODNAME)
-
 /* flag to keep track of how we were registered */
 static int secondary;
 
@@ -67,7 +65,7 @@ static int __init capability_init (void)
         /* register ourselves with the security framework */
         if (register_security (&capability_ops)) {
                 /* try registering with primary module */
-                if (mod_reg_security (MY_NAME, &capability_ops)) {
+                if (mod_reg_security (KBUILD_MODNAME, &capability_ops)) {
                         printk (KERN_INFO "Failure registering capabilities "
                                 "with primary security module.\n");
                         return -EINVAL;
@@ -85,7 +83,7 @@ static void __exit capability_exit (void)
                 return;
         /* remove ourselves from the security framework */
         if (secondary) {
-                if (mod_unreg_security (MY_NAME, &capability_ops))
+                if (mod_unreg_security (KBUILD_MODNAME, &capability_ops))
                         printk (KERN_INFO "Failure unregistering capabilities "
                                 "with primary module.\n");
                 return;