From d52dd365eaf5c2bc13dde46ab5bb6f28fde5e697 Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Thu, 21 Oct 2004 18:15:39 -0700 Subject: [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 Signed-off-by: Linus Torvalds --- security/security.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'security') 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 #include -#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)) { -- cgit v1.2.3