Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-beck.git] / arch / x86 / kernel / microcode_core.c

diff --git a/arch/x86/kernel/microcode_core.c b/arch/x86/kernel/microcode_core.c
index c6aa7eb6cda40a0200b9657cfd6aabce476cfa3c..fda91c307104aff283f083a1ea0797b5f7971f91 100644 (file)
--- a/arch/x86/kernel/microcode_core.c
+++ b/arch/x86/kernel/microcode_core.c
@@ -565,6 +565,8 @@ module_init(microcode_init);
 
 static void __exit microcode_exit(void)
 {
+       struct cpuinfo_x86 *c = &cpu_data(0);
+
        microcode_dev_exit();
 
        unregister_hotcpu_notifier(&mc_cpu_notifier);
@@ -582,6 +584,9 @@ static void __exit microcode_exit(void)
 
        microcode_ops = NULL;
 
+       if (c->x86_vendor == X86_VENDOR_AMD)
+               exit_amd_microcode();
+
        pr_info("Microcode Update Driver: v" MICROCODE_VERSION " removed.\n");
 }
 module_exit(microcode_exit);