diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2007-12-21 09:04:49 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2007-12-21 09:04:49 -0800 |
| commit | 63ba603f731c289560e9ecde820c939bc65c10f1 (patch) | |
| tree | 604a84dd679ac7c9a971df6476e66badca7df27b /driver | |
| parent | 992f65ff8e44f70ca01b6ce5da0b09a6d5d15ae4 (diff) | |
| download | patches-63ba603f731c289560e9ecde820c939bc65c10f1.tar.gz | |
2.6.24-rc6 refresh
Diffstat (limited to 'driver')
4 files changed, 13 insertions, 13 deletions
diff --git a/driver/block-device.patch b/driver/block-device.patch index be5b4577db87e4..c7b19eb62973e9 100644 --- a/driver/block-device.patch +++ b/driver/block-device.patch @@ -1008,7 +1008,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> static int exact_lock(dev_t dev, void *data) --- a/drivers/md/dm.c +++ b/drivers/md/dm.c -@@ -1097,7 +1097,7 @@ static void event_callback(void *context +@@ -1109,7 +1109,7 @@ static void event_callback(void *context list_splice_init(&md->uevent_list, &uevents); spin_unlock_irqrestore(&md->uevent_lock, flags); @@ -1017,15 +1017,15 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> atomic_inc(&md->event_nr); wake_up(&md->eventq); -@@ -1502,7 +1502,7 @@ int dm_resume(struct mapped_device *md) - - dm_table_unplug_all(map); - +@@ -1530,7 +1530,7 @@ out: + *---------------------------------------------------------------*/ + void dm_kobject_uevent(struct mapped_device *md) + { - kobject_uevent(&md->disk->kobj, KOBJ_CHANGE); + kobject_uevent(&md->disk->dev.kobj, KOBJ_CHANGE); + } - r = 0; - + uint32_t dm_next_uevent_seq(struct mapped_device *md) --- a/drivers/md/md.c +++ b/drivers/md/md.c @@ -1396,9 +1396,9 @@ static int bind_rdev_to_array(mdk_rdev_t diff --git a/driver/kobject-change-arch-x86-kernel-cpu-intel_cacheinfo.c-to-use-kobject_init_and_add.patch b/driver/kobject-change-arch-x86-kernel-cpu-intel_cacheinfo.c-to-use-kobject_init_and_add.patch index 42ac6629ee7535..441c6cb9f8d313 100644 --- a/driver/kobject-change-arch-x86-kernel-cpu-intel_cacheinfo.c-to-use-kobject_init_and_add.patch +++ b/driver/kobject-change-arch-x86-kernel-cpu-intel_cacheinfo.c-to-use-kobject_init_and_add.patch @@ -17,7 +17,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/arch/x86/kernel/cpu/intel_cacheinfo.c +++ b/arch/x86/kernel/cpu/intel_cacheinfo.c -@@ -732,10 +732,8 @@ static int __cpuinit cache_add_dev(struc +@@ -733,10 +733,8 @@ static int __cpuinit cache_add_dev(struc if (unlikely(retval < 0)) return retval; @@ -30,7 +30,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> if (retval < 0) { cpuid4_cache_sysfs_exit(cpu); return retval; -@@ -745,10 +743,9 @@ static int __cpuinit cache_add_dev(struc +@@ -746,10 +744,9 @@ static int __cpuinit cache_add_dev(struc this_object = INDEX_KOBJECT_PTR(cpu,i); this_object->cpu = cpu; this_object->index = i; @@ -44,7 +44,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> if (unlikely(retval)) { for (j = 0; j < i; j++) { kobject_unregister( -@@ -758,10 +755,12 @@ static int __cpuinit cache_add_dev(struc +@@ -759,10 +756,12 @@ static int __cpuinit cache_add_dev(struc cpuid4_cache_sysfs_exit(cpu); break; } diff --git a/driver/kobject-convert-arch-from-kobject_unregister-to-kobject_put.patch b/driver/kobject-convert-arch-from-kobject_unregister-to-kobject_put.patch index fc8ffac2f75b3d..8effdbeed1505b 100644 --- a/driver/kobject-convert-arch-from-kobject_unregister-to-kobject_put.patch +++ b/driver/kobject-convert-arch-from-kobject_unregister-to-kobject_put.patch @@ -81,7 +81,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/arch/x86/kernel/cpu/intel_cacheinfo.c +++ b/arch/x86/kernel/cpu/intel_cacheinfo.c -@@ -748,10 +748,9 @@ static int __cpuinit cache_add_dev(struc +@@ -749,10 +749,9 @@ static int __cpuinit cache_add_dev(struc "index%1lu", i); if (unlikely(retval)) { for (j = 0; j < i; j++) { @@ -94,7 +94,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> cpuid4_cache_sysfs_exit(cpu); break; } -@@ -776,8 +775,8 @@ static void __cpuinit cache_remove_dev(s +@@ -777,8 +776,8 @@ static void __cpuinit cache_remove_dev(s cpu_clear(cpu, cache_dev_map); for (i = 0; i < num_cache_leaves; i++) diff --git a/driver/sysfs-crash-debugging.patch b/driver/sysfs-crash-debugging.patch index d94b2a7badab2e..6899af9d281f48 100644 --- a/driver/sysfs-crash-debugging.patch +++ b/driver/sysfs-crash-debugging.patch @@ -27,7 +27,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/arch/x86/kernel/traps_32.c +++ b/arch/x86/kernel/traps_32.c -@@ -401,6 +401,7 @@ void die(const char * str, struct pt_reg +@@ -400,6 +400,7 @@ void die(const char * str, struct pt_reg #endif printk("\n"); |