Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6c1733ac authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Cc: Andi Kleen <andi@firstfloor.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent c607cf0c

drivers/base/cpu.c

+8 −8
Original line number Original line Diff line number Diff line
@@ -79,24 +79,24 @@ void unregister_cpu(struct cpu *cpu) 
}

}





#ifdef CONFIG_ARCH_CPU_PROBE_RELEASE

#ifdef CONFIG_ARCH_CPU_PROBE_RELEASE

static ssize_t cpu_probe_store(struct class *class,

static ssize_t cpu_probe_store(struct sys_device *dev,

				struct class_attribute *attr,

				struct sysdev_attribute *attr,

				const char *buf,

				const char *buf,

			       size_t count)

			       size_t count)

{

{

	return arch_cpu_probe(buf, count);

	return arch_cpu_probe(buf, count);

}

}





static ssize_t cpu_release_store(struct class *class,

static ssize_t cpu_release_store(struct sys_device *dev,

				struct class_attribute *attr,

				struct sysdev_attribute *attr,

				const char *buf,

				const char *buf,

				 size_t count)

				 size_t count)

{

{

	return arch_cpu_release(buf, count);

	return arch_cpu_release(buf, count);

}

}





static CLASS_ATTR(probe, S_IWUSR, NULL, cpu_probe_store);

static SYSDEV_ATTR(probe, S_IWUSR, NULL, cpu_probe_store);

static CLASS_ATTR(release, S_IWUSR, NULL, cpu_release_store);

static SYSDEV_ATTR(release, S_IWUSR, NULL, cpu_release_store);

#endif /* CONFIG_ARCH_CPU_PROBE_RELEASE */

#endif /* CONFIG_ARCH_CPU_PROBE_RELEASE */





#else /* ... !CONFIG_HOTPLUG_CPU */

#else /* ... !CONFIG_HOTPLUG_CPU */
@@ -261,8 +261,8 @@ int __init cpu_dev_init(void) 




static struct sysdev_class_attribute *cpu_sysdev_class_attrs[] = {

static struct sysdev_class_attribute *cpu_sysdev_class_attrs[] = {

#ifdef CONFIG_ARCH_CPU_PROBE_RELEASE

#ifdef CONFIG_ARCH_CPU_PROBE_RELEASE

	&class_attr_probe.attr,

	&attr_probe,

	&class_attr_release.attr,

	&attr_release,

#endif

#endif

	&cpu_attrs[0].attr,

	&cpu_attrs[0].attr,

	&cpu_attrs[1].attr,

	&cpu_attrs[1].attr,