diff options
| author | Sam Ravnborg <sam@mars.ravnborg.org> | 2006-01-06 21:17:50 +0100 |
|---|---|---|
| committer | Sam Ravnborg <sam@mars.ravnborg.org> | 2006-01-06 21:17:50 +0100 |
| commit | 367cb704212cd0c9273ba2b1e62523139210563b (patch) | |
| tree | cda6402ea19e2b706ad8ac9a186f1e391ab3c6ea /security | |
| parent | 20ede2741551d4a1d24313292beb0da915a55911 (diff) | |
| download | linux-3.10-367cb704212cd0c9273ba2b1e62523139210563b.tar.gz linux-3.10-367cb704212cd0c9273ba2b1e62523139210563b.tar.bz2 linux-3.10-367cb704212cd0c9273ba2b1e62523139210563b.zip | |
kbuild: un-stringnify KBUILD_MODNAME
Now when kbuild passes KBUILD_MODNAME with "" do not __stringify it when
used. Remove __stringnify for all users.
This also fixes the output of:
$ ls -l /sys/module/
drwxr-xr-x 4 root root 0 2006-01-05 14:24 pcmcia
drwxr-xr-x 4 root root 0 2006-01-05 14:24 pcmcia_core
drwxr-xr-x 3 root root 0 2006-01-05 14:24 "processor"
drwxr-xr-x 3 root root 0 2006-01-05 14:24 "psmouse"
The quoting of the module names will be gone again.
Thanks to GregKH + Kay Sievers for reproting this.
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Diffstat (limited to 'security')
| -rw-r--r-- | security/capability.c | 6 |
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; |