summaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-01-06 15:23:56 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-06 15:23:56 -0800
commit57d1c91fa6d9146b309b7511f6432dea2a24858b (patch)
treed7958dd87eb950cc3eeaf8b32fc372c0e7ff6702 /security
parent47853e7fa588bef826c9799a87b33904b32bd905 (diff)
parent37193147991a53b2e9f573d0ec47f63a2d4de8dc (diff)
downloadlinux-3.10-57d1c91fa6d9146b309b7511f6432dea2a24858b.tar.gz
linux-3.10-57d1c91fa6d9146b309b7511f6432dea2a24858b.tar.bz2
linux-3.10-57d1c91fa6d9146b309b7511f6432dea2a24858b.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild
Diffstat (limited to 'security')
-rw-r--r--security/capability.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/security/capability.c b/security/capability.c
index ec18d607562..f9b35cc0b24 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;