From 66aac06a83c5eb243569109bc23a901424868534 Mon Sep 17 00:00:00 2001
From: Tim Abbott <tabbott@mit.edu>
Date: Mon, 21 Jul 2008 20:17:17 -0400
Subject: [PATCH] Use local functions for module_init and module_exit.

Signed-off-by: Tim Abbott <tabbott@mit.edu>
---
 kmodsrc/helper.c  |  7 +++++--
 kmodsrc/ksplice.c | 10 +++++-----
 kmodsrc/primary.c |  7 +++++--
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/kmodsrc/helper.c b/kmodsrc/helper.c
index 7b96026..f39bdc4 100644
--- a/kmodsrc/helper.c
+++ b/kmodsrc/helper.c
@@ -38,7 +38,7 @@ extern struct module_pack pack;
 #define helper_init_module KSPLICE_UNIQ(helper_init_module)
 extern int helper_init_module(void);
 
-int init_module(void)
+static int init_helper(void)
 {
 	pack.helper_relocs = ksplice_relocs;
 	pack.helper_relocs_end = ksplice_relocs_end;
@@ -51,6 +51,9 @@ int init_module(void)
 	return helper_init_module();
 }
 
-void cleanup_module(void)
+static void cleanup_helper(void)
 {
 }
+
+module_init(init_helper);
+module_exit(cleanup_helper);
diff --git a/kmodsrc/ksplice.c b/kmodsrc/ksplice.c
index 701408d..4a6b469 100644
--- a/kmodsrc/ksplice.c
+++ b/kmodsrc/ksplice.c
@@ -163,9 +163,6 @@ static int ends_with(const char *str, const char *suffix);
 		}						\
 	} while (0)
 
-int init_module(void);
-void cleanup_module(void);
-
 /* primary */
 static int activate_primary(struct module_pack *pack);
 static int resolve_patch_symbols(struct module_pack *pack);
@@ -1289,15 +1286,18 @@ static int module_on_each_symbol(struct module *mod,
 EXPORT_SYMBOL_GPL(init_ksplice_module);
 EXPORT_SYMBOL_GPL(cleanup_ksplice_module);
 
-int init_module(void)
+static int init_ksplice(void)
 {
 	return 0;
 }
 
-void cleanup_module(void)
+static void cleanup_ksplice(void)
 {
 }
 
+module_init(init_ksplice);
+module_exit(cleanup_ksplice);
+
 static int kernel_lookup(const char *name, struct list_head *vals)
 {
 	int ret;
diff --git a/kmodsrc/primary.c b/kmodsrc/primary.c
index f4a953a..eb14431 100644
--- a/kmodsrc/primary.c
+++ b/kmodsrc/primary.c
@@ -71,13 +71,13 @@ struct module_pack pack = {
 };
 EXPORT_SYMBOL_GPL(pack);
 
-int init_module(void)
+static int init_primary(void)
 {
 	pack.debug = debug;
 	return 0;
 }
 
-void cleanup_module(void)
+static void cleanup_primary(void)
 {
 	cleanup_ksplice_module(&pack);
 }
@@ -88,3 +88,6 @@ int helper_init_module(void)
 	return init_ksplice_module(&pack);
 }
 EXPORT_SYMBOL_GPL(helper_init_module);
+
+module_init(init_primary);
+module_exit(cleanup_primary);
-- 
2.11.4.GIT