diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2010-04-29 19:53:17 -0400 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2010-04-29 19:53:17 -0400 |
| commit | d9c5841e22231e4e49fd0a1004164e6fce59b7a6 (patch) | |
| tree | e1f589c46b3ff79bbe7b1b2469f6362f94576da6 /arch/x86/kernel/microcode_core.c | |
| parent | b701a47ba48b698976fb2fe05fb285b0edc1d26a (diff) | |
| parent | 5967ed87ade85a421ef814296c3c7f182b08c225 (diff) | |
Merge branch 'x86/asm' into x86/atomic
Merge reason:
Conflict between LOCK_PREFIX_HERE and relative alternatives
pointers
Resolved Conflicts:
arch/x86/include/asm/alternative.h
arch/x86/kernel/alternative.c
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'arch/x86/kernel/microcode_core.c')
| -rw-r--r-- | arch/x86/kernel/microcode_core.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/x86/kernel/microcode_core.c b/arch/x86/kernel/microcode_core.c index 0c8632433090..cceb5bc3c3c2 100644 --- a/arch/x86/kernel/microcode_core.c +++ b/arch/x86/kernel/microcode_core.c | |||
| @@ -521,9 +521,6 @@ static int __init microcode_init(void) | |||
| 521 | return PTR_ERR(microcode_pdev); | 521 | return PTR_ERR(microcode_pdev); |
| 522 | } | 522 | } |
| 523 | 523 | ||
| 524 | if (microcode_ops->init) | ||
| 525 | microcode_ops->init(µcode_pdev->dev); | ||
| 526 | |||
| 527 | get_online_cpus(); | 524 | get_online_cpus(); |
| 528 | mutex_lock(µcode_mutex); | 525 | mutex_lock(µcode_mutex); |
| 529 | 526 | ||
| @@ -566,9 +563,6 @@ static void __exit microcode_exit(void) | |||
| 566 | 563 | ||
| 567 | platform_device_unregister(microcode_pdev); | 564 | platform_device_unregister(microcode_pdev); |
| 568 | 565 | ||
| 569 | if (microcode_ops->fini) | ||
| 570 | microcode_ops->fini(); | ||
| 571 | |||
| 572 | microcode_ops = NULL; | 566 | microcode_ops = NULL; |
| 573 | 567 | ||
| 574 | pr_info("Microcode Update Driver: v" MICROCODE_VERSION " removed.\n"); | 568 | pr_info("Microcode Update Driver: v" MICROCODE_VERSION " removed.\n"); |