diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2005-12-14 11:08:28 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-12-14 11:08:28 -0800 |
| commit | e62d1a68ce38e18af8fac4d09916eebc4fb9d1cd (patch) | |
| tree | 48ca2295fc13e2d91e37d04c0128d8fc0d357784 /driver | |
| parent | cb800587b993a7c4b8c30a42b1304c148a49e8a9 (diff) | |
| download | patches-e62d1a68ce38e18af8fac4d09916eebc4fb9d1cd.tar.gz | |
refresh for 2.6.15-rc5-git4
Diffstat (limited to 'driver')
| -rw-r--r-- | driver/block-device-symlink-name-fix.patch | 8 | ||||
| -rw-r--r-- | driver/remove-KOBJECT_UEVENT.patch | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/driver/block-device-symlink-name-fix.patch b/driver/block-device-symlink-name-fix.patch index b3cd447678122..dbc20fe2f04a0 100644 --- a/driver/block-device-symlink-name-fix.patch +++ b/driver/block-device-symlink-name-fix.patch @@ -18,7 +18,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- gregkh-2.6.orig/fs/partitions/check.c +++ gregkh-2.6/fs/partitions/check.c -@@ -325,12 +325,31 @@ void add_partition(struct gendisk *disk, +@@ -336,12 +336,31 @@ void add_partition(struct gendisk *disk, disk->part[part-1] = p; } @@ -51,8 +51,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } } -@@ -444,8 +463,12 @@ void del_gendisk(struct gendisk *disk) - disk->stamp = 0; +@@ -461,8 +480,12 @@ void del_gendisk(struct gendisk *disk) + devfs_remove_disk(disk); if (disk->driverfs_dev) { + char *disk_name = make_block_name(disk); @@ -64,4 +64,4 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + } put_device(disk->driverfs_dev); } - ndevfs_remove(kobject_name(&disk->kobj)); + kobject_uevent(&disk->kobj, KOBJ_REMOVE); diff --git a/driver/remove-KOBJECT_UEVENT.patch b/driver/remove-KOBJECT_UEVENT.patch index f27cf700823ed..af662254149c9 100644 --- a/driver/remove-KOBJECT_UEVENT.patch +++ b/driver/remove-KOBJECT_UEVENT.patch @@ -193,7 +193,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> outside the kernel tree does. Such modules require Y here. -config KOBJECT_UEVENT -- bool "Kernel Userspace Events" +- bool "Kernel Userspace Events" if EMBEDDED - depends on NET - default y - help |