dect/linux-2.6
Archived
14
0
Fork 0
Code Releases Activity

Merge branch 'ucode' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp into x86/urgent

Browse source
This commit is contained in:
Ingo Molnar 2011-12-05 16:38:51 +01:00
commit f1b23714cb
2 changed files with 27 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
arch/x86/include/asm/msr.h
View file

@ -169,7 +169,14 @@ static inline int wrmsr_safe(unsigned msr, unsigned low, unsigned high)
return native_write_msr_safe(msr, low, high); return native_write_msr_safe(msr, low, high);
} }
/* rdmsr with exception handling */ /*
* rdmsr with exception handling.
*
* Please note that the exception handling works only after we've
* switched to the "smart" #GP handler in trap_init() which knows about
* exception tables - using this macro earlier than that causes machine
* hangs on boxes which do not implement the @msr in the first argument.
*/
#define rdmsr_safe(msr, p1, p2) \ #define rdmsr_safe(msr, p1, p2) \
({ \ ({ \
int __err; \ int __err; \

28
arch/x86/kernel/microcode_core.c
View file

@ -256,7 +256,7 @@ static int __init microcode_dev_init(void)
return 0; return 0;
} }
static void microcode_dev_exit(void) static void __exit microcode_dev_exit(void)
{ {
misc_deregister(&microcode_dev); misc_deregister(&microcode_dev);
} }
@ -519,10 +519,8 @@ static int __init microcode_init(void)
microcode_pdev = platform_device_register_simple("microcode", -1, microcode_pdev = platform_device_register_simple("microcode", -1,
NULL, 0); NULL, 0);
if (IS_ERR(microcode_pdev)) { if (IS_ERR(microcode_pdev))
microcode_dev_exit();
return PTR_ERR(microcode_pdev); return PTR_ERR(microcode_pdev);
}
get_online_cpus(); get_online_cpus();
mutex_lock(&microcode_mutex); mutex_lock(&microcode_mutex);
@ -532,14 +530,12 @@ static int __init microcode_init(void)
mutex_unlock(&microcode_mutex); mutex_unlock(&microcode_mutex);
put_online_cpus(); put_online_cpus();
if (error) { if (error)
platform_device_unregister(microcode_pdev); goto out_pdev;
return error;
}
error = microcode_dev_init(); error = microcode_dev_init();
if (error) if (error)
return error; goto out_sysdev_driver;
register_syscore_ops(&mc_syscore_ops); register_syscore_ops(&mc_syscore_ops);
register_hotcpu_notifier(&mc_cpu_notifier); register_hotcpu_notifier(&mc_cpu_notifier);
@ -548,6 +544,20 @@ static int __init microcode_init(void)
" <tigran@aivazian.fsnet.co.uk>, Peter Oruba\n"); " <tigran@aivazian.fsnet.co.uk>, Peter Oruba\n");
return 0; return 0;
out_sysdev_driver:
get_online_cpus();
mutex_lock(&microcode_mutex);
sysdev_driver_unregister(&cpu_sysdev_class, &mc_sysdev_driver);
mutex_unlock(&microcode_mutex);
put_online_cpus();
out_pdev:
platform_device_unregister(microcode_pdev);
return error;
} }
module_init(microcode_init); module_init(microcode_init);