UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Borislav Petkov 2016-06-06 17:10:48 +02:00 committed by Ingo Molnar
parent 9198251af1
commit 0c5fa827f1
2 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arch/x86/include/asm/microcode_intel.h
View File

@ -70,9 +70,4 @@ static inline int __init save_microcode_in_initrd_intel(void) { return -EINVAL;
static inline void reload_ucode_intel(void) {} static inline void reload_ucode_intel(void) {}
#endif #endif
#ifdef CONFIG_HOTPLUG_CPU
extern int save_mc_for_early(u8 *mc);
#else
static inline int save_mc_for_early(u8 *mc) { return 0; }
#endif
#endif /* _ASM_X86_MICROCODE_INTEL_H */ #endif /* _ASM_X86_MICROCODE_INTEL_H */

15
arch/x86/kernel/cpu/microcode/intel.c
View File

@ -456,8 +456,6 @@ static void show_saved_mc(void)
#endif #endif
} }
#ifdef CONFIG_HOTPLUG_CPU
static DEFINE_MUTEX(x86_cpu_microcode_mutex);
/* /*
* Save this mc into mc_saved_data. So it will be loaded early when a CPU is * Save this mc into mc_saved_data. So it will be loaded early when a CPU is
* hot added or resumes. * hot added or resumes.
@ -465,14 +463,16 @@ static DEFINE_MUTEX(x86_cpu_microcode_mutex);
* Please make sure this mc should be a valid microcode patch before calling * Please make sure this mc should be a valid microcode patch before calling
* this function. * this function.
*/ */
int save_mc_for_early(u8 *mc) static void save_mc_for_early(u8 *mc)
{ {
#ifdef CONFIG_HOTPLUG_CPU
static DEFINE_MUTEX(x86_cpu_microcode_mutex);
struct microcode_intel *mc_saved_tmp[MAX_UCODE_COUNT]; struct microcode_intel *mc_saved_tmp[MAX_UCODE_COUNT];
unsigned int mc_saved_count_init; unsigned int mc_saved_count_init;
unsigned int num_saved; unsigned int num_saved;
struct microcode_intel **mc_saved; struct microcode_intel **mc_saved;
int ret = 0; int ret, i;
int i;
/* /*
* Hold hotplug lock so mc_saved_data is not accessed by a CPU in * 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)
out: out:
mutex_unlock(&x86_cpu_microcode_mutex); mutex_unlock(&x86_cpu_microcode_mutex);
return ret;
}
EXPORT_SYMBOL_GPL(save_mc_for_early);
#endif #endif
}
static bool __init load_builtin_intel_microcode(struct cpio_data *cp) static bool __init load_builtin_intel_microcode(struct cpio_data *cp)
{ {