diff options
| author | Chris Wright <chrisw@osdl.org> | 2004-10-21 18:15:39 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-10-21 18:15:39 -0700 |
| commit | d52dd365eaf5c2bc13dde46ab5bb6f28fde5e697 (patch) | |
| tree | e68ac4a1793484c11a37067e210e3fd95bac1484 | |
| parent | 2b14f6e37f2bd979659590512b0a6767c2e75669 (diff) | |
[PATCH] lsm: rename security_scaffolding_startup to security_init
Rename security_scaffolding_startup() to security_init(). It always
bothered me.
Signed-off-by: Chris Wright <chrisw@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | include/linux/security.h | 2 | ||||
| -rw-r--r-- | init/main.c | 2 | ||||
| -rw-r--r-- | security/security.c | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/include/linux/security.h b/include/linux/security.h index c1792f3fb6ca..e73390395981 100644 --- a/include/linux/security.h +++ b/include/linux/security.h @@ -1903,7 +1903,7 @@ static inline int security_netlink_recv(struct sk_buff * skb) } /* prototypes */ -extern int security_scaffolding_startup (void); +extern int security_init (void); extern int register_security (struct security_operations *ops); extern int unregister_security (struct security_operations *ops); extern int mod_reg_security (const char *name, struct security_operations *ops); diff --git a/init/main.c b/init/main.c index 0c0135ad0645..72f596af2181 100644 --- a/init/main.c +++ b/init/main.c @@ -555,7 +555,7 @@ asmlinkage void __init start_kernel(void) proc_caches_init(); buffer_init(); unnamed_dev_init(); - security_scaffolding_startup(); + security_init(); vfs_caches_init(num_physpages); radix_tree_init(); signals_init(); diff --git a/security/security.c b/security/security.c index 70a9fcfde8e3..890b678acecc 100644 --- a/security/security.c +++ b/security/security.c @@ -18,7 +18,7 @@ #include <linux/sched.h> #include <linux/security.h> -#define SECURITY_SCAFFOLD_VERSION "1.0.0" +#define SECURITY_FRAMEWORK_VERSION "1.0.0" /* things that live in dummy.c */ extern struct security_operations dummy_security_ops; @@ -49,13 +49,13 @@ static void __init do_security_initcalls(void) } /** - * security_scaffolding_startup - initializes the security scaffolding framework + * security_init - initializes the security framework * * This should be called early in the kernel initialization sequence. */ -int __init security_scaffolding_startup (void) +int __init security_init(void) { - printk (KERN_INFO "Security Scaffold v" SECURITY_SCAFFOLD_VERSION + printk (KERN_INFO "Security Framework v" SECURITY_FRAMEWORK_VERSION " initialized\n"); if (verify (&dummy_security_ops)) { |