diff options
| author | Borislav Petkov <bp@suse.de> | 2016-06-06 11:10:48 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-06-08 05:04:20 -0400 |
| commit | 0c5fa827f1130d05858f158022c21e9e7e5cff92 (patch) | |
| tree | 5f4bc0e1988ca8553bae16bb74724500fe569656 /arch/x86/kernel/cpu/microcode | |
| parent | 9198251af1554c21fae8e43a940a8bed435ee1b3 (diff) | |
x86/microcode/intel: Unexport save_mc_for_early()
It is used only in intel.c, drop the CONFIG_HOTPLUG_CPU ifdeffery from
the header and turn it into a void function because its return value
wasn't being used anyway.
No functionality change.
Signed-off-by: Borislav Petkov <bp@suse.de>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/1465225850-7352-8-git-send-email-bp@alien8.de
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kernel/cpu/microcode')
| -rw-r--r-- | arch/x86/kernel/cpu/microcode/intel.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/arch/x86/kernel/cpu/microcode/intel.c b/arch/x86/kernel/cpu/microcode/intel.c index b5759a3f0aa8..359e2034b558 100644 --- a/arch/x86/kernel/cpu/microcode/intel.c +++ b/arch/x86/kernel/cpu/microcode/intel.c | |||
| @@ -456,8 +456,6 @@ static void show_saved_mc(void) | |||
| 456 | #endif | 456 | #endif |
| 457 | } | 457 | } |
| 458 | 458 | ||
| 459 | #ifdef CONFIG_HOTPLUG_CPU | ||
| 460 | static DEFINE_MUTEX(x86_cpu_microcode_mutex); | ||
| 461 | /* | 459 | /* |
| 462 | * Save this mc into mc_saved_data. So it will be loaded early when a CPU is | 460 | * Save this mc into mc_saved_data. So it will be loaded early when a CPU is |
| 463 | * hot added or resumes. | 461 | * hot added or resumes. |
| @@ -465,14 +463,16 @@ static DEFINE_MUTEX(x86_cpu_microcode_mutex); | |||
| 465 | * Please make sure this mc should be a valid microcode patch before calling | 463 | * Please make sure this mc should be a valid microcode patch before calling |
| 466 | * this function. | 464 | * this function. |
| 467 | */ | 465 | */ |
| 468 | int save_mc_for_early(u8 *mc) | 466 | static void save_mc_for_early(u8 *mc) |
| 469 | { | 467 | { |
| 468 | #ifdef CONFIG_HOTPLUG_CPU | ||
| 469 | static DEFINE_MUTEX(x86_cpu_microcode_mutex); | ||
| 470 | |||
| 470 | struct microcode_intel *mc_saved_tmp[MAX_UCODE_COUNT]; | 471 | struct microcode_intel *mc_saved_tmp[MAX_UCODE_COUNT]; |
| 471 | unsigned int mc_saved_count_init; | 472 | unsigned int mc_saved_count_init; |
| 472 | unsigned int num_saved; | 473 | unsigned int num_saved; |
| 473 | struct microcode_intel **mc_saved; | 474 | struct microcode_intel **mc_saved; |
| 474 | int ret = 0; | 475 | int ret, i; |
| 475 | int i; | ||
| 476 | 476 | ||
| 477 | /* | 477 | /* |
| 478 | * Hold hotplug lock so mc_saved_data is not accessed by a CPU in | 478 | * Hold hotplug lock so mc_saved_data is not accessed by a CPU in |
| @@ -515,11 +515,8 @@ int save_mc_for_early(u8 *mc) | |||
| 515 | 515 | ||
| 516 | out: | 516 | out: |
| 517 | mutex_unlock(&x86_cpu_microcode_mutex); | 517 | mutex_unlock(&x86_cpu_microcode_mutex); |
| 518 | |||
| 519 | return ret; | ||
| 520 | } | ||
| 521 | EXPORT_SYMBOL_GPL(save_mc_for_early); | ||
| 522 | #endif | 518 | #endif |
| 519 | } | ||
| 523 | 520 | ||
| 524 | static bool __init load_builtin_intel_microcode(struct cpio_data *cp) | 521 | static bool __init load_builtin_intel_microcode(struct cpio_data *cp) |
| 525 | { | 522 | { |
