From 3999cc426150da4435bfb3741b75a8967f1fe4de Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Sat, 22 Dec 2007 21:18:25 -0800
Subject: [PATCH] --- yaml --- r: 75187 b: refs/heads/master c:
 d172f4ef31bec924c6ebcb242c9d7d290811e1e5 h: refs/heads/master i:   75185:
 41b551e1dcc303581e274559b70777e32a2450e8   75183:
 cb90e307fd6d6019fb3af45cb28485a212649946 v: v3

---
 [refs]                |  2 +-
 trunk/kernel/params.c | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index dd126eb00997..b406e47f1a3c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e5f114e97d6e4833e90ca408af9eb1e7a3262b5e
+refs/heads/master: d172f4ef31bec924c6ebcb242c9d7d290811e1e5
diff --git a/trunk/kernel/params.c b/trunk/kernel/params.c
index 2a4c51487e72..7686417ee00e 100644
--- a/trunk/kernel/params.c
+++ b/trunk/kernel/params.c
@@ -697,8 +697,18 @@ static struct kset_uevent_ops module_uevent_ops = {
 decl_subsys(module, &module_ktype, &module_uevent_ops);
 int module_sysfs_initialized;
 
+static void module_release(struct kobject *kobj)
+{
+	/*
+	 * Stupid empty release function to allow the memory for the kobject to
+	 * be properly cleaned up.  This will not need to be present for 2.6.25
+	 * with the upcoming kobject core rework.
+	 */
+}
+
 static struct kobj_type module_ktype = {
 	.sysfs_ops =	&module_sysfs_ops,
+	.release =	module_release,
 };
 
 /*