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
This commit is contained in:
commit
5356f664e1
@ -4054,6 +4054,14 @@ L: user-mode-linux-user@lists.sourceforge.net
|
|||||||
W: http://user-mode-linux.sourceforge.net
|
W: http://user-mode-linux.sourceforge.net
|
||||||
S: Maintained
|
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:
|
FAT/VFAT/MSDOS FILESYSTEM:
|
||||||
P: OGAWA Hirofumi
|
P: OGAWA Hirofumi
|
||||||
M: hirofumi@mail.parknet.co.jp
|
M: hirofumi@mail.parknet.co.jp
|
||||||
|
@ -697,8 +697,18 @@ static struct kset_uevent_ops module_uevent_ops = {
|
|||||||
decl_subsys(module, &module_ktype, &module_uevent_ops);
|
decl_subsys(module, &module_ktype, &module_uevent_ops);
|
||||||
int module_sysfs_initialized;
|
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 = {
|
static struct kobj_type module_ktype = {
|
||||||
.sysfs_ops = &module_sysfs_ops,
|
.sysfs_ops = &module_sysfs_ops,
|
||||||
|
.release = module_release,
|
||||||
};
|
};
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
Loading…
Reference in New Issue
Block a user