Hi Greg, Today's linux-next merge of the driver-core tree got a conflict in include/linux/cpu.h between commit 2987557f52b9 ("driver-core/cpu: Expose hotpluggability to the rest of the kernel") from the tip tree and commit 8a25a2fd126c ("cpu: convert 'cpu' and 'machinecheck' sysdev_class to a regular subsystem") from the driver-core tree. Just context changes. I fixed it up (see below) and can carry the fix as necessary -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx diff --cc include/linux/cpu.h index 305c263,fc3da0d..0000000 --- a/include/linux/cpu.h +++ b/include/linux/cpu.h @@@ -26,16 -26,15 +26,16 @@@ struct cpu }; extern int register_cpu(struct cpu *cpu, int num); - extern struct sys_device *get_cpu_sysdev(unsigned cpu); + extern struct device *get_cpu_device(unsigned cpu); +extern bool cpu_is_hotpluggable(unsigned cpu); - extern int cpu_add_sysdev_attr(struct sysdev_attribute *attr); - extern void cpu_remove_sysdev_attr(struct sysdev_attribute *attr); + extern int cpu_add_dev_attr(struct device_attribute *attr); + extern void cpu_remove_dev_attr(struct device_attribute *attr); - extern int cpu_add_sysdev_attr_group(struct attribute_group *attrs); - extern void cpu_remove_sysdev_attr_group(struct attribute_group *attrs); + extern int cpu_add_dev_attr_group(struct attribute_group *attrs); + extern void cpu_remove_dev_attr_group(struct attribute_group *attrs); - extern int sched_create_sysfs_power_savings_entries(struct sysdev_class *cls); + extern int sched_create_sysfs_power_savings_entries(struct device *dev); #ifdef CONFIG_HOTPLUG_CPU extern void unregister_cpu(struct cpu *cpu);
Attachment:
pgpA41UcJPDe1.pgp
Description: PGP signature