From abf5cde8170a8ada3500e286f4b155f29a777f01 Mon Sep 17 00:00:00 2001
From: Rusty Russell <rusty@rustcorp.com.au>
Date: Thu, 5 Aug 2010 12:59:09 -0600
Subject: [PATCH] --- yaml --- r: 204815 b: refs/heads/master c:
 36b0360d17dc3928cc96347a18a3a1cdbb7e506d h: refs/heads/master i:   204813:
 03074c897853989fecf6cd9d54724adbd7581a8d   204811:
 b620c38c9ec97f60e52cc3f19f4f78d3328ad82a   204807:
 a80384a6e896c83b04110d2f420ccdb5a931e216   204799:
 77a3bfc9b2bd0f8e7306833c600a4ee3673b44dc v: v3

---
 [refs]                |  2 +-
 trunk/kernel/module.c | 13 ++++++-------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 7a5ff9678978..12d5cd206c21 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8f6d037815466cb25e7de8f00536eca71d94d4c3
+refs/heads/master: 36b0360d17dc3928cc96347a18a3a1cdbb7e506d
diff --git a/trunk/kernel/module.c b/trunk/kernel/module.c
index fd8d46c69766..a64b26cf1879 100644
--- a/trunk/kernel/module.c
+++ b/trunk/kernel/module.c
@@ -1504,11 +1504,6 @@ static void mod_sysfs_fini(struct module *mod)
 
 #else /* !CONFIG_SYSFS */
 
-static int mod_sysfs_init(struct module *mod)
-{
-	return 0;
-}
-
 static int mod_sysfs_setup(struct module *mod,
 			   const struct load_info *info,
 			   struct kernel_param *kparam,
@@ -1521,13 +1516,17 @@ static void mod_sysfs_fini(struct module *mod)
 {
 }
 
+static void module_remove_modinfo_attrs(struct module *mod)
+{
+}
+
 static void del_usage_links(struct module *mod)
 {
 }
 
 #endif /* CONFIG_SYSFS */
 
-static void mod_kobject_remove(struct module *mod)
+static void mod_sysfs_teardown(struct module *mod)
 {
 	del_usage_links(mod);
 	module_remove_modinfo_attrs(mod);
@@ -1557,7 +1556,7 @@ static void free_module(struct module *mod)
 	mutex_lock(&module_mutex);
 	stop_machine(__unlink_module, mod, NULL);
 	mutex_unlock(&module_mutex);
-	mod_kobject_remove(mod);
+	mod_sysfs_teardown(mod);
 
 	/* Remove dynamic debug info */
 	ddebug_remove_module(mod->name);