diff options
| -rw-r--r-- | driver-core/sysdev-fix-up-the-probe-release-attributes.patch | 62 | ||||
| -rw-r--r-- | driver-core/sysdev-pass-attribute-in-sysdev_class-attributes-show-store.patch | 8 | ||||
| -rw-r--r-- | series | 2 | ||||
| -rw-r--r-- | version | 2 |
4 files changed, 68 insertions, 6 deletions
diff --git a/driver-core/sysdev-fix-up-the-probe-release-attributes.patch b/driver-core/sysdev-fix-up-the-probe-release-attributes.patch new file mode 100644 index 00000000000000..a833813b93c609 --- /dev/null +++ b/driver-core/sysdev-fix-up-the-probe-release-attributes.patch @@ -0,0 +1,62 @@ +From foo@baz Thu Jan 21 15:07:59 PST 2010 +Date: Thu, 21 Jan 2010 15:07:59 -0800 +To: Greg KH <greg@kroah.com> +From: Greg Kroah-Hartman <gregkh@suse.de> +Subject: sysdev: fix up the probe/release attributes + +These should be sysdev attributes, not class attributes. This patch +should resolve the problem. + +Thanks to Stephen Rothwell for pointing out the problem. + +Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> +Cc: Andi Kleen <andi@firstfloor.org> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> +--- + drivers/base/cpu.c | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +--- a/drivers/base/cpu.c ++++ b/drivers/base/cpu.c +@@ -79,24 +79,24 @@ void unregister_cpu(struct cpu *cpu) + } + + #ifdef CONFIG_ARCH_CPU_PROBE_RELEASE +-static ssize_t cpu_probe_store(struct class *class, +- struct class_attribute *attr, ++static ssize_t cpu_probe_store(struct sys_device *dev, ++ struct sysdev_attribute *attr, + const char *buf, + size_t count) + { + return arch_cpu_probe(buf, count); + } + +-static ssize_t cpu_release_store(struct class *class, +- struct class_attribute *attr, ++static ssize_t cpu_release_store(struct sys_device *dev, ++ struct sysdev_attribute *attr, + const char *buf, + size_t count) + { + return arch_cpu_release(buf, count); + } + +-static CLASS_ATTR(probe, S_IWUSR, NULL, cpu_probe_store); +-static CLASS_ATTR(release, S_IWUSR, NULL, cpu_release_store); ++static SYSDEV_ATTR(probe, S_IWUSR, NULL, cpu_probe_store); ++static SYSDEV_ATTR(release, S_IWUSR, NULL, cpu_release_store); + #endif /* CONFIG_ARCH_CPU_PROBE_RELEASE */ + + #else /* ... !CONFIG_HOTPLUG_CPU */ +@@ -261,8 +261,8 @@ int __init cpu_dev_init(void) + + static struct sysdev_class_attribute *cpu_sysdev_class_attrs[] = { + #ifdef CONFIG_ARCH_CPU_PROBE_RELEASE +- &class_attr_probe.attr, +- &class_attr_release.attr, ++ &attr_probe.attr, ++ &attr_release.attr, + #endif + &cpu_attrs[0].attr, + &cpu_attrs[1].attr, diff --git a/driver-core/sysdev-pass-attribute-in-sysdev_class-attributes-show-store.patch b/driver-core/sysdev-pass-attribute-in-sysdev_class-attributes-show-store.patch index f9206e0062b67e..27546a008d008f 100644 --- a/driver-core/sysdev-pass-attribute-in-sysdev_class-attributes-show-store.patch +++ b/driver-core/sysdev-pass-attribute-in-sysdev_class-attributes-show-store.patch @@ -372,7 +372,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #define _SYSDEV_CLASS_ATTR(_name,_mode,_show,_store) \ --- a/kernel/perf_event.c +++ b/kernel/perf_event.c -@@ -5274,13 +5274,16 @@ void __init perf_event_init(void) +@@ -5283,13 +5283,16 @@ void __init perf_event_init(void) register_cpu_notifier(&perf_cpu_nb); } @@ -390,7 +390,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> const char *buf, size_t count) { -@@ -5309,13 +5312,17 @@ perf_set_reserve_percpu(struct sysdev_cl +@@ -5318,13 +5321,17 @@ perf_set_reserve_percpu(struct sysdev_cl return count; } @@ -412,7 +412,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> int err; --- a/kernel/sched.c +++ b/kernel/sched.c -@@ -9199,11 +9199,13 @@ static ssize_t sched_power_savings_store +@@ -9202,11 +9202,13 @@ static ssize_t sched_power_savings_store #ifdef CONFIG_SCHED_MC static ssize_t sched_mc_power_savings_show(struct sysdev_class *class, @@ -426,7 +426,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> const char *buf, size_t count) { return sched_power_savings_store(buf, count, 0); -@@ -9215,11 +9217,13 @@ static SYSDEV_CLASS_ATTR(sched_mc_power_ +@@ -9218,11 +9220,13 @@ static SYSDEV_CLASS_ATTR(sched_mc_power_ #ifdef CONFIG_SCHED_SMT static ssize_t sched_smt_power_savings_show(struct sysdev_class *dev, @@ -54,6 +54,7 @@ driver-core/sysfs-cache-the-last-sysfs_dirent-to-improve-readdir-scalability-v2. driver-core/driver-core-firmware_class-remove-base.h-header-inclusion.patch driver-core/kobject-constify-struct-kset_uevent_ops.patch driver-core/howto-updates-on-subsystem-trees-patchwork-next-vs.-mm.patch +driver-core/sysdev-fix-up-the-probe-release-attributes.patch # sent to Lennart 01-15-2010 driver-core/msi-laptop-support-standard-ec-66-62-command-on-msi-notebook-and-nebook.patch @@ -416,4 +417,3 @@ staging/staging-comedi-c6xdigio-checkpatch-cleanups.patch staging/staging-comedi-rti800-checkpatch-cleanups.patch - @@ -1 +1 @@ -2.6.33-rc4-git7 +2.6.33-rc5 |