linux-next: manual merge of the driver-core tree with the powerpc tree

[Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>]

Hi Greg,

Today's linux-next merge of the driver-core tree got a conflict in
arch/powerpc/kernel/sysfs.c between commit 595fe91447b0 ("powerpc: Export
PIR data through sysfs") from the powerpc tree and commits 8a25a2fd126c
("cpu: convert 'cpu' and 'machinecheck' sysdev_class to a regular
subsystem") and 707827f3387d ("powerpc/cpuidle: cpuidle driver for
pSeries") from the driver-core tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc arch/powerpc/kernel/sysfs.c
index 6fdf5ff,5e7c165..0000000
--- a/arch/powerpc/kernel/sysfs.c
+++ b/arch/powerpc/kernel/sysfs.c
@@@ -51,8 -50,7 +51,8 @@@ static ssize_t store_smt_snooze_delay(s
  	if (ret != 1)
  		return -EINVAL;
  
- 	per_cpu(smt_snooze_delay, cpu->sysdev.id) = snooze;
+ 	per_cpu(smt_snooze_delay, cpu->dev.id) = snooze;
 +	update_smt_snooze_delay(snooze);
  
  	return count;
  }
@@@ -179,13 -177,11 +179,13 @@@ SYSFS_PMCSETUP(mmcra, SPRN_MMCRA)
  SYSFS_PMCSETUP(purr, SPRN_PURR);
  SYSFS_PMCSETUP(spurr, SPRN_SPURR);
  SYSFS_PMCSETUP(dscr, SPRN_DSCR);
 +SYSFS_PMCSETUP(pir, SPRN_PIR);
  
- static SYSDEV_ATTR(mmcra, 0600, show_mmcra, store_mmcra);
- static SYSDEV_ATTR(spurr, 0600, show_spurr, NULL);
- static SYSDEV_ATTR(dscr, 0600, show_dscr, store_dscr);
- static SYSDEV_ATTR(purr, 0600, show_purr, store_purr);
- static SYSDEV_ATTR(pir, 0400, show_pir, NULL);
+ static DEVICE_ATTR(mmcra, 0600, show_mmcra, store_mmcra);
+ static DEVICE_ATTR(spurr, 0600, show_spurr, NULL);
+ static DEVICE_ATTR(dscr, 0600, show_dscr, store_dscr);
+ static DEVICE_ATTR(purr, 0600, show_purr, store_purr);
++static DEVICE_ATTR(pir, 0400, show_pir, NULL);
  
  unsigned long dscr_default = 0;
  EXPORT_SYMBOL(dscr_default);
@@@ -386,19 -381,16 +385,19 @@@ static void __cpuinit register_cpu_onli
  
  #ifdef CONFIG_PPC64
  	if (cpu_has_feature(CPU_FTR_MMCRA))
- 		sysdev_create_file(s, &attr_mmcra);
+ 		device_create_file(s, &dev_attr_mmcra);
  
  	if (cpu_has_feature(CPU_FTR_PURR))
- 		sysdev_create_file(s, &attr_purr);
+ 		device_create_file(s, &dev_attr_purr);
  
  	if (cpu_has_feature(CPU_FTR_SPURR))
- 		sysdev_create_file(s, &attr_spurr);
+ 		device_create_file(s, &dev_attr_spurr);
  
  	if (cpu_has_feature(CPU_FTR_DSCR))
- 		sysdev_create_file(s, &attr_dscr);
+ 		device_create_file(s, &dev_attr_dscr);
 +
 +	if (cpu_has_feature(CPU_FTR_PPCAS_ARCH_V2))
- 		sysdev_create_file(s, &attr_pir);
++		device_create_file(s, &dev_attr_pir);
  #endif /* CONFIG_PPC64 */
  
  	cacheinfo_cpu_online(cpu);
@@@ -459,19 -451,16 +458,19 @@@ static void unregister_cpu_online(unsig
  
  #ifdef CONFIG_PPC64
  	if (cpu_has_feature(CPU_FTR_MMCRA))
- 		sysdev_remove_file(s, &attr_mmcra);
+ 		device_remove_file(s, &dev_attr_mmcra);
  
  	if (cpu_has_feature(CPU_FTR_PURR))
- 		sysdev_remove_file(s, &attr_purr);
+ 		device_remove_file(s, &dev_attr_purr);
  
  	if (cpu_has_feature(CPU_FTR_SPURR))
- 		sysdev_remove_file(s, &attr_spurr);
+ 		device_remove_file(s, &dev_attr_spurr);
  
  	if (cpu_has_feature(CPU_FTR_DSCR))
- 		sysdev_remove_file(s, &attr_dscr);
+ 		device_remove_file(s, &dev_attr_dscr);
 +
 +	if (cpu_has_feature(CPU_FTR_PPCAS_ARCH_V2))
- 		sysdev_remove_file(s, &attr_pir);
++		device_remove_file(s, &dev_attr_pir);
  #endif /* CONFIG_PPC64 */
  
  	cacheinfo_cpu_offline(cpu);

Attachment: pgpy0Yetm7fCJ.pgp
Description: PGP signature