diff options
| author | James Morris <james.morris@microsoft.com> | 2018-05-01 11:02:34 -0700 |
|---|---|---|
| committer | James Morris <james.morris@microsoft.com> | 2018-05-01 11:02:34 -0700 |
| commit | b3859ee18ed287170b66b19a78191f7312ec3470 (patch) | |
| tree | c52550132fdf6802b159531498bde8dcfbd26180 /arch/x86/kernel/cpu/microcode/intel.c | |
| parent | b393a707c84bb56a7800c93849fd8b492f76ba42 (diff) | |
| parent | 6da6c0db5316275015e8cc2959f12a17584aeb64 (diff) | |
| download | linux-next-b3859ee18ed287170b66b19a78191f7312ec3470.tar.gz linux-next-b3859ee18ed287170b66b19a78191f7312ec3470.zip | |
Merge tag 'v4.17-rc3' into next-general
Merge to Linux v4.17-rc3 which has stability bugfix.
Diffstat (limited to 'arch/x86/kernel/cpu/microcode/intel.c')
| -rw-r--r-- | arch/x86/kernel/cpu/microcode/intel.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/x86/kernel/cpu/microcode/intel.c b/arch/x86/kernel/cpu/microcode/intel.c index 32b8e5724f96..1c2cfa0644aa 100644 --- a/arch/x86/kernel/cpu/microcode/intel.c +++ b/arch/x86/kernel/cpu/microcode/intel.c @@ -485,7 +485,6 @@ static void show_saved_mc(void) */ static void save_mc_for_early(u8 *mc, unsigned int size) { -#ifdef CONFIG_HOTPLUG_CPU /* Synchronization during CPU hotplug. */ static DEFINE_MUTEX(x86_cpu_microcode_mutex); @@ -495,7 +494,6 @@ static void save_mc_for_early(u8 *mc, unsigned int size) show_saved_mc(); mutex_unlock(&x86_cpu_microcode_mutex); -#endif } static bool load_builtin_intel_microcode(struct cpio_data *cp) |