diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2007-12-11 09:21:11 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2007-12-11 09:21:11 -0800 |
| commit | ac56b1e33bdcfc88f140434fdf6e5f8bfae22e99 (patch) | |
| tree | e43b6511cb32940336c641c3cecabf5590794988 /driver | |
| parent | 3a06612fafd3d888fa75407c7e277268da20ac68 (diff) | |
| download | patches-ac56b1e33bdcfc88f140434fdf6e5f8bfae22e99.tar.gz | |
2.6.24-rc5 refresh
Diffstat (limited to 'driver')
6 files changed, 13 insertions, 13 deletions
diff --git a/driver/block-device.patch b/driver/block-device.patch index b8a83453d84787..cbbbcf63bfc90a 100644 --- a/driver/block-device.patch +++ b/driver/block-device.patch @@ -855,7 +855,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } --- a/drivers/block/aoe/aoeblk.c +++ b/drivers/block/aoe/aoeblk.c -@@ -14,8 +14,10 @@ +@@ -15,8 +15,10 @@ static struct kmem_cache *buf_pool_cache; @@ -867,7 +867,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> struct aoedev *d = disk->private_data; return snprintf(page, PAGE_SIZE, -@@ -25,50 +27,47 @@ static ssize_t aoedisk_show_state(struct +@@ -26,50 +28,47 @@ static ssize_t aoedisk_show_state(struct (d->nopen && !(d->flags & DEVFL_UP)) ? ",closewait" : ""); /* I'd rather see nopen exported so we can ditch closewait */ } @@ -938,7 +938,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> }; static const struct attribute_group attr_group = { -@@ -78,12 +77,12 @@ static const struct attribute_group attr +@@ -79,12 +78,12 @@ static const struct attribute_group attr static int aoedisk_add_sysfs(struct aoedev *d) { diff --git a/driver/driver-core-add-way-to-get-to-bus-device-klist.patch b/driver/driver-core-add-way-to-get-to-bus-device-klist.patch index e02ce26e055c72..4252c77d0c8ac6 100644 --- a/driver/driver-core-add-way-to-get-to-bus-device-klist.patch +++ b/driver/driver-core-add-way-to-get-to-bus-device-klist.patch @@ -39,7 +39,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> bus_kset = kset_create_and_add("bus", &bus_uevent_ops, NULL); --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c -@@ -1251,16 +1251,19 @@ static void __init pci_sort_breadthfirst +@@ -1227,16 +1227,19 @@ static void __init pci_sort_breadthfirst struct klist_node *n; struct device *dev; struct pci_dev *pdev; diff --git a/driver/kobject-convert-kernel_kset-to-be-a-kobject.patch b/driver/kobject-convert-kernel_kset-to-be-a-kobject.patch index 19357a721a4edf..2f4da5d7de80c7 100644 --- a/driver/kobject-convert-kernel_kset-to-be-a-kobject.patch +++ b/driver/kobject-convert-kernel_kset-to-be-a-kobject.patch @@ -146,7 +146,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/mm/slub.c +++ b/mm/slub.c -@@ -4087,8 +4087,7 @@ static int __init slab_sysfs_init(void) +@@ -4094,8 +4094,7 @@ static int __init slab_sysfs_init(void) struct kmem_cache *s; int err; diff --git a/driver/kset-convert-slub-to-use-kset_create.patch b/driver/kset-convert-slub-to-use-kset_create.patch index 82ec1dcf7f3b80..d880845581ac14 100644 --- a/driver/kset-convert-slub-to-use-kset_create.patch +++ b/driver/kset-convert-slub-to-use-kset_create.patch @@ -16,7 +16,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/mm/slub.c +++ b/mm/slub.c -@@ -3958,7 +3958,7 @@ static struct kset_uevent_ops slab_ueven +@@ -3965,7 +3965,7 @@ static struct kset_uevent_ops slab_ueven .filter = uevent_filter, }; @@ -25,7 +25,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #define ID_STR_LENGTH 64 -@@ -4011,7 +4011,7 @@ static int sysfs_slab_add(struct kmem_ca +@@ -4018,7 +4018,7 @@ static int sysfs_slab_add(struct kmem_ca * This is typically the case for debug situations. In that * case we can catch duplicate names easily. */ @@ -34,7 +34,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> name = s->name; } else { /* -@@ -4022,7 +4022,7 @@ static int sysfs_slab_add(struct kmem_ca +@@ -4029,7 +4029,7 @@ static int sysfs_slab_add(struct kmem_ca } kobject_set_name(&s->kobj, name); @@ -43,7 +43,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> s->kobj.ktype = &slab_ktype; kobject_init(&s->kobj); err = kobject_add(&s->kobj); -@@ -4067,9 +4067,8 @@ static int sysfs_slab_alias(struct kmem_ +@@ -4074,9 +4074,8 @@ static int sysfs_slab_alias(struct kmem_ /* * If we have a leftover link then remove it. */ @@ -55,7 +55,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } al = kmalloc(sizeof(struct saved_alias), GFP_KERNEL); -@@ -4088,8 +4087,8 @@ static int __init slab_sysfs_init(void) +@@ -4095,8 +4094,8 @@ static int __init slab_sysfs_init(void) struct kmem_cache *s; int err; diff --git a/driver/kset-move-sys-slab-to-sys-kernel-slab.patch b/driver/kset-move-sys-slab-to-sys-kernel-slab.patch index 165068170937d9..02834c24a7b274 100644 --- a/driver/kset-move-sys-slab-to-sys-kernel-slab.patch +++ b/driver/kset-move-sys-slab-to-sys-kernel-slab.patch @@ -41,7 +41,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> corresponding debug option. All options can be set on a slab that does --- a/mm/slub.c +++ b/mm/slub.c -@@ -4087,7 +4087,8 @@ static int __init slab_sysfs_init(void) +@@ -4094,7 +4094,8 @@ static int __init slab_sysfs_init(void) struct kmem_cache *s; int err; diff --git a/driver/remove-struct-kobj_type-from-struct-kset.patch b/driver/remove-struct-kobj_type-from-struct-kset.patch index 8b50c4a248aedd..8e20fd2c8d82d1 100644 --- a/driver/remove-struct-kobj_type-from-struct-kset.patch +++ b/driver/remove-struct-kobj_type-from-struct-kset.patch @@ -782,7 +782,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> /** --- a/mm/slub.c +++ b/mm/slub.c -@@ -3958,7 +3958,7 @@ static struct kset_uevent_ops slab_ueven +@@ -3965,7 +3965,7 @@ static struct kset_uevent_ops slab_ueven .filter = uevent_filter, }; @@ -791,7 +791,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #define ID_STR_LENGTH 64 -@@ -4021,8 +4021,9 @@ static int sysfs_slab_add(struct kmem_ca +@@ -4028,8 +4028,9 @@ static int sysfs_slab_add(struct kmem_ca name = create_unique_id(s); } |