diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-23 13:06:49 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-23 13:06:49 -0800 |
| commit | 5356f664e1d2149b67d2aeed644cc1def128a4ac (patch) | |
| tree | 8af6289553a71b193082657d508998f828020c95 | |
| parent | aaa594cd11c6dff4e3545602be1aadd79969f953 (diff) | |
| parent | d172f4ef31bec924c6ebcb242c9d7d290811e1e5 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6:
Modules: fix memory leak of module names
UIO: Add a MAINTAINERS entry for Userspace I/O
| -rw-r--r-- | MAINTAINERS | 8 | ||||
| -rw-r--r-- | kernel/params.c | 10 |
2 files changed, 18 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 907094f07142..3d567fd2e0a1 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4054,6 +4054,14 @@ L: user-mode-linux-user@lists.sourceforge.net W: http://user-mode-linux.sourceforge.net S: Maintained +USERSPACE I/O (UIO) +P: Hans J. Koch +M: hjk@linutronix.de +P: Greg Kroah-Hartman +M: gregkh@suse.de +L: linux-kernel@vger.kernel.org +S: Maintained + FAT/VFAT/MSDOS FILESYSTEM: P: OGAWA Hirofumi M: hirofumi@mail.parknet.co.jp diff --git a/kernel/params.c b/kernel/params.c index 2a4c51487e72..7686417ee00e 100644 --- a/kernel/params.c +++ b/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, }; /* |