From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Fri, 6 Jan 2012 19:42:52 +0000 (-0800)
Subject: Merge branch 'driver-core-next' into Linux 3.2
X-Git-Tag: v3.3-rc1~174^2
X-Git-Url: http://pileus.org/git/?p=~andy%2Flinux;a=commitdiff_plain;h=ff4b8a57f0aaa2882d444ca44b2b9b333d22a4df

Merge branch 'driver-core-next' into Linux 3.2

This resolves the conflict in the arch/arm/mach-s3c64xx/s3c6400.c file,
and it fixes the build error in the arch/x86/kernel/microcode_core.c
file, that the merge did not catch.

The microcode_core.c patch was provided by Stephen Rothwell
<sfr@canb.auug.org.au> who was invaluable in the merge issues involved
with the large sysdev removal process in the driver-core tree.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

ff4b8a57f0aaa2882d444ca44b2b9b333d22a4df
diff --cc arch/x86/kernel/microcode_core.c
index 9d46f5e43b5,cf88f2a1647..c6aa7eb6cda
--- a/arch/x86/kernel/microcode_core.c
+++ b/arch/x86/kernel/microcode_core.c
@@@ -535,7 -541,7 +537,7 @@@ static int __init microcode_init(void
  
  	error = microcode_dev_init();
  	if (error)
- 		goto out_sysdev_driver;
 -		return error;
++		goto out_driver;
  
  	register_syscore_ops(&mc_syscore_ops);
  	register_hotcpu_notifier(&mc_cpu_notifier);
@@@ -544,20 -550,6 +546,20 @@@
  		" <tigran@aivazian.fsnet.co.uk>, Peter Oruba\n");
  
  	return 0;
 +
- out_sysdev_driver:
++out_driver:
 +	get_online_cpus();
 +	mutex_lock(&microcode_mutex);
 +
- 	sysdev_driver_unregister(&cpu_sysdev_class, &mc_sysdev_driver);
++	subsys_interface_unregister(&mc_cpu_interface);
 +
 +	mutex_unlock(&microcode_mutex);
 +	put_online_cpus();
 +
 +out_pdev:
 +	platform_device_unregister(microcode_pdev);
 +	return error;
 +
  }
  module_init(microcode_init);